aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-04-06 12:40:21 -0700
committerAnton Tananaev <anton@traccar.org>2024-04-06 12:40:21 -0700
commitbb7db069faa0ddd85589224601b02f08c2cb81b2 (patch)
treefc8945ee61949a5fc2e43f779cfb6faaa402e7ea /.github
parent3454f5b8b580ef7aee121ed2d7821db7161e1bd9 (diff)
downloadtrackermap-server-bb7db069faa0ddd85589224601b02f08c2cb81b2.tar.gz
trackermap-server-bb7db069faa0ddd85589224601b02f08c2cb81b2.tar.bz2
trackermap-server-bb7db069faa0ddd85589224601b02f08c2cb81b2.zip
Update CI and packaging scripts
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/gradle.yml6
-rw-r--r--.github/workflows/release.yml28
2 files changed, 14 insertions, 20 deletions
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index cbe2721bb..e50354cbd 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
with:
- distribution: zulu
+ distribution: temurin
java-version: 11
cache: gradle
- run: ./gradlew build --no-daemon --warning-mode=fail
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c025593e1..7c8c0eeb8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,31 +14,25 @@ jobs:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- run: git checkout ${{ github.ref_name }}
working-directory: ./traccar-web
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: gradle
- run: ./gradlew build
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
- node-version: 18
+ node-version: 21
cache: npm
- cache-dependency-path: |
- traccar-web/package-lock.json
- traccar-web/modern/package-lock.json
- - run: |
- wget -q https://traccar.nyc3.digitaloceanspaces.com/download/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
+ cache-dependency-path: traccar-web/package-lock.json
+ - run: npm ci && npm run build
+ working-directory: ./traccar-web
- run: |
sudo dpkg --add-architecture i386
sudo apt-get update
@@ -48,10 +42,10 @@ jobs:
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
+ wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9+9.1/OpenJDK17U-jdk_x64_windows_hotspot_17.0.9_9.zip
+ wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9+9.1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz
+ wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9+9.1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.9_9.tar.gz
+ wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9+9.1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz
./package.sh ${{ github.event.inputs.version }}
- name: Upload installers
working-directory: ./setup