From 4dc615fe68aff225af8fa9edfc8608705b7f3c36 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 21:39:11 +0300 Subject: [PATCH 1/9] ci: Fix double zipping --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7947c4154..599a7d0a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: trilium-mac-x64.zip - path: dist/trilium-mac-x64*.zip + path: dist/trilium-mac-x64 build_darwin-arm64: name: Build macOS aarch64 runs-on: ubuntu-latest @@ -39,7 +39,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: trilium-mac-arm64.zip - path: dist/trilium-mac-arm64*.zip + path: dist/trilium-mac-arm64 build_linux-x64: name: Build Linux x86_64 runs-on: ubuntu-latest @@ -75,7 +75,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: trilium-linux-x64-server.tar.xz - path: dist/trilium-linux-x64-server-*.tar.xz + path: dist/trilium-linux-x64-server build_windows-x64: name: Build Windows x86_64 runs-on: ubuntu-latest @@ -98,7 +98,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: trilium-windows-x64.zip - path: dist/trilium-windows-x64-*.zip + path: dist/trilium-windows-x64 build_docker: name: Build Docker image runs-on: ubuntu-latest From 27c2d1efbd28a5ed739207f0143ef2ffd994502b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 21:46:37 +0300 Subject: [PATCH 2/9] ci: Fix double .zip artifact name --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 599a7d0a4..1221790c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - run: ./bin/build-mac-x64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-mac-x64.zip + name: trilium-mac-x64 path: dist/trilium-mac-x64 build_darwin-arm64: name: Build macOS aarch64 @@ -38,7 +38,7 @@ jobs: - run: ./bin/build-mac-arm64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-mac-arm64.zip + name: trilium-mac-arm64 path: dist/trilium-mac-arm64 build_linux-x64: name: Build Linux x86_64 @@ -97,7 +97,7 @@ jobs: - run: ./bin/build-win-x64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-windows-x64.zip + name: trilium-windows-x64 path: dist/trilium-windows-x64 build_docker: name: Build Docker image From cc55e1b657759657cea98d43d230fcb9f5c166fa Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 21:48:04 +0300 Subject: [PATCH 3/9] ci: Remove .tar.xz to avoid double archiving --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1221790c4..9fddfcc58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,8 @@ jobs: - run: ./bin/build-linux-x64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-linux-x64.tar.xz - path: dist/trilium-linux-x64-*.tar.xz + name: trilium-linux-x64 + path: dist/trilium-linux-x64 - uses: actions/upload-artifact@v4 with: name: trilium_amd64.deb @@ -74,7 +74,7 @@ jobs: - run: ./bin/build-server.sh - uses: actions/upload-artifact@v4 with: - name: trilium-linux-x64-server.tar.xz + name: trilium-linux-x64-server path: dist/trilium-linux-x64-server build_windows-x64: name: Build Windows x86_64 From 7dc8c662ca285533b2f5cd9d423ffcf3be30bb7d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 21:50:32 +0300 Subject: [PATCH 4/9] ci: Revert .tar.xz to avoid losing permissions --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9fddfcc58..9f7b941f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,8 @@ jobs: - run: ./bin/build-linux-x64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-linux-x64 - path: dist/trilium-linux-x64 + name: trilium-linux-x64.tar.xz + path: dist/trilium-linux-x64-*.tar.xz - uses: actions/upload-artifact@v4 with: name: trilium_amd64.deb @@ -74,8 +74,8 @@ jobs: - run: ./bin/build-server.sh - uses: actions/upload-artifact@v4 with: - name: trilium-linux-x64-server - path: dist/trilium-linux-x64-server + name: trilium-linux-x64-server.tar.xz + path: dist/trilium-linux-x64-server-*.tar.xz build_windows-x64: name: Build Windows x86_64 runs-on: ubuntu-latest From 80e647ffec49a74e3f68c7647bf12928482b9f84 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 21:58:14 +0300 Subject: [PATCH 5/9] ci: Update build info --- .github/workflows/build.yml | 3 +++ .github/workflows/main.yml | 20 +++++++++++++++----- bin/release.sh | 2 +- bin/update-build-info.sh | 3 +++ 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 bin/update-build-info.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..e5c6fb1ae --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,3 @@ +on: + workflow_call: + diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f7b941f5..f49421667 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,9 @@ jobs: node-version: 20 cache: "npm" - run: npm ci - - run: ./bin/build-mac-x64.sh + - run: | + ./bin/update-build-info.sh + ./bin/build-mac-x64.sh - uses: actions/upload-artifact@v4 with: name: trilium-mac-x64 @@ -35,7 +37,9 @@ jobs: node-version: 20 cache: "npm" - run: npm ci - - run: ./bin/build-mac-arm64.sh + - run: | + ./bin/update-build-info.sh + ./bin/build-mac-arm64.sh - uses: actions/upload-artifact@v4 with: name: trilium-mac-arm64 @@ -51,7 +55,9 @@ jobs: node-version: 20 cache: "npm" - run: npm ci - - run: ./bin/build-linux-x64.sh + - run: | + ./bin/update-build-info.sh + ./bin/build-linux-x64.sh - uses: actions/upload-artifact@v4 with: name: trilium-linux-x64.tar.xz @@ -71,7 +77,9 @@ jobs: node-version: 20 cache: "npm" - run: npm ci - - run: ./bin/build-server.sh + - run: | + ./bin/update-build-info.sh + ./bin/build-server.sh - uses: actions/upload-artifact@v4 with: name: trilium-linux-x64-server.tar.xz @@ -94,7 +102,9 @@ jobs: node-version: 20 cache: "npm" - run: npm ci - - run: ./bin/build-win-x64.sh + - run: | + ./bin/update-build-info.sh + ./bin/build-win-x64.sh - uses: actions/upload-artifact@v4 with: name: trilium-windows-x64 diff --git a/bin/release.sh b/bin/release.sh index 41fdd073b..abcba3e2b 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -32,7 +32,7 @@ mv package.json.tmp package.json git add package.json -echo 'export = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > src/services/build.ts +./update-build-info.sh git add src/services/build.ts diff --git a/bin/update-build-info.sh b/bin/update-build-info.sh new file mode 100644 index 000000000..7da2cbc68 --- /dev/null +++ b/bin/update-build-info.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +echo 'export = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > src/services/build.ts \ No newline at end of file From 128af66797dcbc81b9b359b31f123d4bc74053f3 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 22:02:29 +0300 Subject: [PATCH 6/9] ci: Don't pack Windows artifact --- .github/workflows/main.yml | 2 +- bin/build-win-x64.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f49421667..a2cde89c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: - run: npm ci - run: | ./bin/update-build-info.sh - ./bin/build-win-x64.sh + ./bin/build-win-x64.sh DONTPACK - uses: actions/upload-artifact@v4 with: name: trilium-windows-x64 diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh index ad359ccb6..43c96304d 100755 --- a/bin/build-win-x64.sh +++ b/bin/build-win-x64.sh @@ -34,9 +34,11 @@ rm -rf $BUILD_DIR/dump-db/node_modules cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.bat $BUILD_DIR/ -echo "Zipping windows x64 electron distribution..." -VERSION=`jq -r ".version" package.json` +if [ "$1" != "DONTPACK" ] +then + echo "Zipping windows x64 electron distribution..." + VERSION=`jq -r ".version" package.json` -cd dist - -zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64 + cd dist + zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64 +fi \ No newline at end of file From 5eabdf8496f6179eb12625b4afe85115c67d9260 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 22:03:51 +0300 Subject: [PATCH 7/9] ci: Cancel unnecessary actions --- .github/workflows/dev.yml | 5 +++++ .github/workflows/main.yml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1146eb572..25d611c06 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -4,6 +4,11 @@ on: branches: - '!develop' - '!feature/update*' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build_docker: name: Build Docker image diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2cde89c0..10a79aa90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,15 @@ on: branches: - 'develop' - 'feature/update*' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} + jobs: build_darwin-x64: name: Build macOS x86_64 From e380fa5224439f35e687245a55fb00434bbdbe21 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 22:10:09 +0300 Subject: [PATCH 8/9] ci: Fix permission issue with build script --- bin/update-build-info.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/update-build-info.sh diff --git a/bin/update-build-info.sh b/bin/update-build-info.sh old mode 100644 new mode 100755 From 5277c3e6b6c5a9f370abec7b970094627db15e23 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 22:23:31 +0300 Subject: [PATCH 9/9] ci: Revert artifact upload for darwin --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10a79aa90..3eb4d172a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,8 +30,8 @@ jobs: ./bin/build-mac-x64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-mac-x64 - path: dist/trilium-mac-x64 + name: trilium-mac-x64.zip + path: dist/trilium-mac-x64*.zip build_darwin-arm64: name: Build macOS aarch64 runs-on: ubuntu-latest @@ -48,8 +48,8 @@ jobs: ./bin/build-mac-arm64.sh - uses: actions/upload-artifact@v4 with: - name: trilium-mac-arm64 - path: dist/trilium-mac-arm64 + name: trilium-mac-arm64.zip + path: dist/trilium-mac-arm64*.zip build_linux-x64: name: Build Linux x86_64 runs-on: ubuntu-latest