From 3788e2f7bce8a25c3c98704e0099ed111f9187b3 Mon Sep 17 00:00:00 2001 From: Kristian Larsson Date: Tue, 4 Feb 2025 21:28:17 +0100 Subject: [PATCH 1/2] Fix version in apt git commits Don't get the ../deb vs in the update-apt-tip-repo where it is directly accessing deb/*.changes instead. Don't get it, yet this did produce the last working apt release. Has this changed? --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a878c8ac..963f8ae7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -694,11 +694,12 @@ jobs: - name: "Get the version" id: get_version run: | - echo ::set-output name=version::$(ls ../deb/*amd64.changes | sed -e 's/.*acton_//' -e 's/_amd64.*//') + echo "VERSION=$(ls ../deb/*amd64.changes | sed -e 's/.*acton_//' -e 's/_amd64.*//')" >> $GITHUB_ENV - name: "Include new deb in Apt repository" run: | cd apt - reprepro include stable ../deb/*.changes + reprepro include stable ../deb/*amd64.changes + reprepro include stable ../deb/*arm64.changes - name: "Push updates to git repository for apt.acton-lang.io" run: | cd apt @@ -707,7 +708,7 @@ jobs: git add . git status git diff - git commit -a -m "Add Acton v${{steps.get_version.outputs.version}}" + git commit -a -m "Add Acton v${VERSION}" git push # Update apt tip repo @@ -742,7 +743,6 @@ jobs: id: get_version run: | echo "VERSION=$(ls deb/*amd64.changes | sed -e 's/.*acton_//' -e 's/_amd64.*//')" >> $GITHUB_ENV - echo ::set-output name=version::$(ls deb/*amd64.changes | sed -e 's/.*acton_//' -e 's/_amd64.*//') - name: "Move .deb files in place" run: | cd apt From cf33bd8086fb40308072bd0aa1d3f660746f29ce Mon Sep 17 00:00:00 2001 From: Kristian Larsson Date: Tue, 4 Feb 2025 21:33:48 +0100 Subject: [PATCH 2/2] TEMP disable if on apt job --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 963f8ae7..268ef6ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -663,7 +663,7 @@ jobs: # Update apt repo update-apt-repo: - if: startsWith(github.ref, 'refs/tags/v') + #if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-latest container: image: debian:experimental