From 5f94cba5d945f57ed78952c8eb0d743d5a392093 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 5 Feb 2023 07:02:24 -0800 Subject: Update release script --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ceb88a7c..e4cf5dc51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -34,7 +34,7 @@ jobs: traccar-web/package-lock.json traccar-web/modern/package-lock.json - run: | - wget -q http://cdn.sencha.com/cmd/7.1.0.15/no-jre/SenchaCmd-7.1.0.15-linux-i386.sh.zip + 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 @@ -47,9 +47,9 @@ 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.4+8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.4_8.zip - wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4+8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4_8.tar.gz - wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4+8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4_8.tar.gz + 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 ./package.sh ${{ github.event.inputs.version }} - name: Upload installers working-directory: ./setup -- cgit v1.2.3 From 8e533cc9cc71523b699efcc0ddf4d46ac30ac389 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 5 Feb 2023 07:10:41 -0800 Subject: Update npm version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4cf5dc51..423ed2d83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - run: ./gradlew build - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 cache: npm cache-dependency-path: | traccar-web/package-lock.json -- cgit v1.2.3 From 9c6de5bea8d6220478a9885ce2e17a7ccaeb3ce3 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 5 Feb 2023 07:21:33 -0800 Subject: Try workaround --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 423ed2d83..d49b3c609 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,8 +41,9 @@ jobs: - run: ./traccar-web/tools/package.sh - run: | sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install innoextract makeself wine32 s3cmd + sudo dpkg -l | awk '/ii lib.*deb.sury.org/ {gsub(/:.*/, s, $2); print $2}' | xargs apt show -a | awk '/Package:/ {p=$2} /APT-Sources: .*focal\/main/ {print p"/focal"}' | sudo xargs eatmydata apt install --allow-downgrades + sudo DEBIAN_FRONTEND=noninteractive eatmydata apt install -y --no-install-recommends wine-stable wine32 + sudo apt-get install innoextract makeself s3cmd - name: Build installers working-directory: ./setup run: | -- cgit v1.2.3 From 7236387b3408525be01a4934894fafb0a65bac1f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 5 Feb 2023 07:30:55 -0800 Subject: Downgrade OS version --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d49b3c609..6eb02ad9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -41,9 +41,8 @@ jobs: - run: ./traccar-web/tools/package.sh - run: | sudo dpkg --add-architecture i386 - sudo dpkg -l | awk '/ii lib.*deb.sury.org/ {gsub(/:.*/, s, $2); print $2}' | xargs apt show -a | awk '/Package:/ {p=$2} /APT-Sources: .*focal\/main/ {print p"/focal"}' | sudo xargs eatmydata apt install --allow-downgrades - sudo DEBIAN_FRONTEND=noninteractive eatmydata apt install -y --no-install-recommends wine-stable wine32 - sudo apt-get install innoextract makeself s3cmd + sudo apt-get update + sudo apt-get install innoextract makeself wine32 s3cmd - name: Build installers working-directory: ./setup run: | -- cgit v1.2.3 From 814fbee673d42588b53bd611128e8be1056ba883 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 5 Feb 2023 07:33:44 -0800 Subject: Try new version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6eb02ad9c..0a9fb2e73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 -- cgit v1.2.3 From a88fec16c1b8b2c3592e9d0a8b52ada6e038a81a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 24 Feb 2023 09:36:39 -0800 Subject: Fix release build job --- .github/workflows/release.yml | 1 + setup/package.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a9fb2e73..a157037a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,7 @@ jobs: 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 diff --git a/setup/package.sh b/setup/package.sh index cbfe03cae..f8ec927eb 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -75,7 +75,7 @@ if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm64" ]; then - check_requirement "Linux 64 Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM 64 JDK (https://adoptium.net/)" + check_requirement "Linux ARM 64 Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM 64 JDK (https://adoptium.net/)" fi if [ $PREREQ = false ]; then info "Missing build requirements, aborting..." -- cgit v1.2.3 From f7731b12156019cafb434ada7183db54cfe76a99 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 19 May 2023 07:49:48 -0700 Subject: Try new CI config --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a157037a5..bbe1ec79f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,9 +40,11 @@ jobs: echo "$HOME/bin/Sencha/Cmd/" >> $GITHUB_PATH - run: ./traccar-web/tools/package.sh - run: | + sudo apt-get update + sudo apt-get install innoextract makeself s3cmd libc6:i386 sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install innoextract makeself wine32 s3cmd + sudo apt-get install wine32 - name: Build installers working-directory: ./setup run: | -- cgit v1.2.3 From 6f55411b41d06eed327c4349ed2a4d104443d7b8 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 19 May 2023 08:05:04 -0700 Subject: Try new CI config --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbe1ec79f..a8e4c5369 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,11 +40,10 @@ jobs: echo "$HOME/bin/Sencha/Cmd/" >> $GITHUB_PATH - run: ./traccar-web/tools/package.sh - run: | - sudo apt-get update - sudo apt-get install innoextract makeself s3cmd libc6:i386 sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install wine32 + 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: | -- cgit v1.2.3