From 2370e1714626fb65ee24024d3e2cabcb90ae2017 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Tue, 28 Jan 2025 10:04:37 -0800 Subject: [PATCH 1/2] ci: switch from j2cli to jinjanate --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1f4ca624..bfbc29c6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -278,13 +278,13 @@ jobs: CADT_VERSION: ${{ steps.tag-name.outputs.TAGNAME }} PLATFORM: ${{ matrix.platform }} run: | - pip install j2cli + pip install jinjanator CLI_DEB_BASE="cadt_${{ steps.tag-name.outputs.TAGNAME }}-1_${PLATFORM}" mkdir -p "deb/$CLI_DEB_BASE/opt/cadt" mkdir -p "deb/$CLI_DEB_BASE/usr/bin" mkdir -p "deb/$CLI_DEB_BASE/etc/systemd/system" mkdir -p "deb/$CLI_DEB_BASE/DEBIAN" - j2 -o "deb/$CLI_DEB_BASE/DEBIAN/control" build-scripts/deb/control.j2 + jinjanate -o "deb/$CLI_DEB_BASE/DEBIAN/control" build-scripts/deb/control.j2 cp -r ${{ matrix.name }}/* "deb/$CLI_DEB_BASE/opt/cadt/" cp build-scripts/deb/cadt@.service deb/$CLI_DEB_BASE/etc/systemd/system/cadt@.service chmod +x deb/$CLI_DEB_BASE/opt/cadt/cadt From ecfb3fe8ab32a0f00cc7465fcd8eb95432350c2b Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Tue, 28 Jan 2025 10:10:50 -0800 Subject: [PATCH 2/2] ci: use github hosted ARM runners --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bfbc29c6..f12284c1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ jobs: artifact-name: cadt-linux-x64 build-command: npm run create-linux-x64-dist sqlite-path: ./node_modules/sqlite3/build/Release/ - - runs-on: [Linux, ARM64] + - runs-on: ubuntu-24.04-arm artifact-name: cadt-linux-arm64 build-command: npm run create-linux-arm64-dist sqlite-path: ./node_modules/sqlite3/build/Release/