Merge branch 'traccar:master' into master

3 files changed, 68 insertions, 7 deletions

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 03a3831b9..ba524068f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Provide as much details as possible, including log fragments, operating system a
 
 Before creating a feature request make sure that the feature or modification that you are requesting is not yet implemented.
 
-Search reposiroty to ensure that there is no existing issues for your request. If there is, add a new comment on that issue.
+Search repository to ensure that there is no existing issues for your request. If there is, add a new comment on that issue.
 
 Provide as much details as possible, including use case for your feature and any benefits that you can think of.
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 42721d3fc..cbe2721bb 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -10,12 +10,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
+    
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
+        distribution: zulu
         java-version: 11
-    - name: Build with Gradle
-      run: ./gradlew build --warning-mode=fail
+        cache: gradle
+    - run: ./gradlew build --no-daemon --warning-mode=fail
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..a8e4c5369
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,61 @@
+name: Build Installers
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        default: 'preview'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          submodules: true
+      - run: git checkout ${{ github.ref_name }}
+        working-directory: ./traccar-web
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: gradle
+      - run: ./gradlew build
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+          cache-dependency-path: |
+            traccar-web/package-lock.json
+            traccar-web/modern/package-lock.json
+      - run: |
+          wget -q https://trials.sencha.com/cmd/7.6.0/SenchaCmd-7.6.0.87-linux-amd64.sh.zip
+          unzip SenchaCmd-*.zip
+          ./SenchaCmd-*.sh -q
+          echo "$HOME/bin/Sencha/Cmd/" >> $GITHUB_PATH
+      - run: ./traccar-web/tools/package.sh
+      - run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install libgcc-s1:i386 libstdc++6:i386
+          sudo apt-get install innoextract makeself wine32 s3cmd
+      - name: Build installers
+        working-directory: ./setup
+        run: |
+          wget -q http://files.jrsoftware.org/is/5/isetup-5.5.6.exe
+          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10/OpenJDK17U-jdk_x64_windows_hotspot_17.0.6_10.zip
+          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz
+          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10/OpenJDK17U-jdk_arm_linux_hotspot_17.0.6_10.tar.gz
+          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz
+          ./package.sh ${{ github.event.inputs.version }}
+      - name: Upload installers
+        working-directory: ./setup
+        env:
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+        run: s3cmd --acl-public put traccar-*.zip s3://traccar/builds/ --host=nyc3.digitaloceanspaces.com --host-bucket=traccar --access_key="$S3_ACCESS_KEY" --secret_key="$S3_SECRET_KEY"