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