diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 2895822..2453435 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -27,92 +27,30 @@ jobs: echo "Upstream version is $upstream_version" fi - - name: Checkout this repo on master(amd64) + - name: Checkout this repo on master uses: actions/checkout@v4 - with: - ref: master - - - name: get snap current amd64 version - id: current_amd64 - uses: mikefarah/yq@master - with: - cmd: yq '.version' 'snap/snapcraft.yaml' - - - name: show snap current amd64 version - run: echo "Current version is ${{ steps.current_amd64.outputs.result }}" - - - name: update to upstream's version number - id: update_amd64 - if: steps.upstream.outputs.version != steps.current_amd64.outputs.result - uses: mikefarah/yq@master - with: - cmd: yq -i '.version = "${{ steps.upstream.outputs.version }}"' 'snap/snapcraft.yaml' - - - name: Commit changes on amd64 - if: steps.update_amd64.outcome == 'success' - run: | - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git add . - git commit -m "update snapcraft.yaml to version ${{ steps.upstream.outputs.version }}" - git push - - - name: Checkout this repo on arm64 - uses: actions/checkout@v4 - with: - ref: arm64 - - - name: get snap current arm64 version - id: current_arm64 - uses: mikefarah/yq@master - with: - cmd: yq '.version' 'snap/snapcraft.yaml' - - - name: show snap current arm64 version - run: echo "Current version is ${{ steps.current_arm64.outputs.result }}" - - - name: update to upstream's version number - id: update_arm64 - if: steps.upstream.outputs.version != steps.current_arm64.outputs.result - uses: mikefarah/yq@master - with: - cmd: yq -i '.version = "${{ steps.upstream.outputs.version }}"' 'snap/snapcraft.yaml' - - - name: Commit changes on arm64 - if: steps.update_arm64.outcome == 'success' - run: | - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git add . - git commit -m "update snapcraft.yaml to version ${{ steps.upstream.outputs.version }}" - git push - - - name: Checkout this repo on armhf - uses: actions/checkout@v4 - with: - ref: armhf - - name: get snap current armhf version - id: current_armhf + - name: get snap current version + id: current uses: mikefarah/yq@master with: cmd: yq '.version' 'snap/snapcraft.yaml' - - name: show snap current armhf version - run: echo "Current version is ${{ steps.current_armhf.outputs.result }}" + - name: show snap current version + run: echo "Current version is ${{ steps.current.outputs.result }}" - name: update to upstream's version number - id: update_armhf - if: steps.upstream.outputs.version != steps.current_armhf.outputs.result + id: update + if: steps.upstream.outputs.version != steps.current.outputs.result uses: mikefarah/yq@master with: cmd: yq -i '.version = "${{ steps.upstream.outputs.version }}"' 'snap/snapcraft.yaml' - - name: Commit changes on armhf - if: steps.update_armhf.outcome == 'success' + - name: Commit changes + if: steps.update.outcome == 'success' run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" git add . git commit -m "update snapcraft.yaml to version ${{ steps.upstream.outputs.version }}" - git push + git push \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e74ec81..18b9c45 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -11,6 +11,8 @@ description: | platforms: amd64: + arm64: + armhf: grade: stable confinement: strict @@ -26,5 +28,8 @@ apps: parts: speedtest: plugin: dump - source: https://install.speedtest.net/app/cli/ookla-speedtest-${SNAPCRAFT_PROJECT_VERSION}-linux-x86_64.tgz + source: + - on amd64: https://install.speedtest.net/app/cli/ookla-speedtest-${SNAPCRAFT_PROJECT_VERSION}-linux-x86_64.tgz + - on arm64: https://install.speedtest.net/app/cli/ookla-speedtest-${SNAPCRAFT_PROJECT_VERSION}-linux-aarch64.tgz + - on armhf: https://install.speedtest.net/app/cli/ookla-speedtest-${SNAPCRAFT_PROJECT_VERSION}-linux-armhf.tgz source-type: tar