diff --git a/.github/workflows/gen_alpine3.12.yml b/.github/workflows/gen_alpine3.12.yml index 96730c2c3..7297b1d7f 100644 --- a/.github/workflows/gen_alpine3.12.yml +++ b/.github/workflows/gen_alpine3.12.yml @@ -77,8 +77,14 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.12" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.12_continuous.yml b/.github/workflows/gen_alpine3.12_continuous.yml index 4b13d14d4..882a6c249 100644 --- a/.github/workflows/gen_alpine3.12_continuous.yml +++ b/.github/workflows/gen_alpine3.12_continuous.yml @@ -84,7 +84,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: "alpine3.12" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" retention-days: 5 upload: @@ -105,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber nightly ~/packages/x86_64/wezterm-*.apk" + run: "bash ci/retry.sh gh release upload --clobber nightly wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.12_tag.yml b/.github/workflows/gen_alpine3.12_tag.yml index 222723819..8a7a5b518 100644 --- a/.github/workflows/gen_alpine3.12_tag.yml +++ b/.github/workflows/gen_alpine3.12_tag.yml @@ -68,13 +68,19 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.12" path: | - ~/packages/x86_64/wezterm-*.apk - ~/.abuild/*.pub + wezterm-*.apk + *.pub upload: runs-on: ubuntu-latest @@ -99,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) ~/packages/x86_64/wezterm-*.apk ~/.abuild/*.pub" + run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) wezterm-*.apk *.pub" diff --git a/.github/workflows/gen_alpine3.13.yml b/.github/workflows/gen_alpine3.13.yml index d3460faa5..2a9db7715 100644 --- a/.github/workflows/gen_alpine3.13.yml +++ b/.github/workflows/gen_alpine3.13.yml @@ -77,8 +77,14 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.13" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.13_continuous.yml b/.github/workflows/gen_alpine3.13_continuous.yml index 05927b8f2..535b4a42d 100644 --- a/.github/workflows/gen_alpine3.13_continuous.yml +++ b/.github/workflows/gen_alpine3.13_continuous.yml @@ -84,7 +84,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: "alpine3.13" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" retention-days: 5 upload: @@ -105,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber nightly ~/packages/x86_64/wezterm-*.apk" + run: "bash ci/retry.sh gh release upload --clobber nightly wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.13_tag.yml b/.github/workflows/gen_alpine3.13_tag.yml index 4add20f0f..af0f82b30 100644 --- a/.github/workflows/gen_alpine3.13_tag.yml +++ b/.github/workflows/gen_alpine3.13_tag.yml @@ -68,13 +68,19 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.13" path: | - ~/packages/x86_64/wezterm-*.apk - ~/.abuild/*.pub + wezterm-*.apk + *.pub upload: runs-on: ubuntu-latest @@ -99,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) ~/packages/x86_64/wezterm-*.apk ~/.abuild/*.pub" + run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) wezterm-*.apk *.pub" diff --git a/.github/workflows/gen_alpine3.14.yml b/.github/workflows/gen_alpine3.14.yml index ce2b0e615..0830fdb77 100644 --- a/.github/workflows/gen_alpine3.14.yml +++ b/.github/workflows/gen_alpine3.14.yml @@ -77,8 +77,14 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.14" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.14_continuous.yml b/.github/workflows/gen_alpine3.14_continuous.yml index 97faf53ae..bb2e16b8a 100644 --- a/.github/workflows/gen_alpine3.14_continuous.yml +++ b/.github/workflows/gen_alpine3.14_continuous.yml @@ -84,7 +84,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: "alpine3.14" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" retention-days: 5 upload: @@ -105,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber nightly ~/packages/x86_64/wezterm-*.apk" + run: "bash ci/retry.sh gh release upload --clobber nightly wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.14_tag.yml b/.github/workflows/gen_alpine3.14_tag.yml index ccb9515e0..28413e1ee 100644 --- a/.github/workflows/gen_alpine3.14_tag.yml +++ b/.github/workflows/gen_alpine3.14_tag.yml @@ -68,13 +68,19 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.14" path: | - ~/packages/x86_64/wezterm-*.apk - ~/.abuild/*.pub + wezterm-*.apk + *.pub upload: runs-on: ubuntu-latest @@ -99,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) ~/packages/x86_64/wezterm-*.apk ~/.abuild/*.pub" + run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) wezterm-*.apk *.pub" diff --git a/.github/workflows/gen_alpine3.15.yml b/.github/workflows/gen_alpine3.15.yml index 52cb79a64..714720b26 100644 --- a/.github/workflows/gen_alpine3.15.yml +++ b/.github/workflows/gen_alpine3.15.yml @@ -77,8 +77,14 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.15" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.15_continuous.yml b/.github/workflows/gen_alpine3.15_continuous.yml index 25ccb8514..05beee446 100644 --- a/.github/workflows/gen_alpine3.15_continuous.yml +++ b/.github/workflows/gen_alpine3.15_continuous.yml @@ -84,7 +84,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: "alpine3.15" - path: "~/packages/x86_64/wezterm-*.apk" + path: "wezterm-*.apk" retention-days: 5 upload: @@ -105,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber nightly ~/packages/x86_64/wezterm-*.apk" + run: "bash ci/retry.sh gh release upload --clobber nightly wezterm-*.apk" diff --git a/.github/workflows/gen_alpine3.15_tag.yml b/.github/workflows/gen_alpine3.15_tag.yml index 5299028f7..f9060af19 100644 --- a/.github/workflows/gen_alpine3.15_tag.yml +++ b/.github/workflows/gen_alpine3.15_tag.yml @@ -68,13 +68,19 @@ jobs: - name: "Package" shell: bash run: "bash ci/deploy.sh" + - name: "Move APKs" + shell: bash + run: "mv ~/packages/x86_64/*.apk ." + - name: "Move APK keys" + shell: bash + run: "mv ~/.abuild/*.pub ." - name: "Upload artifact" uses: actions/upload-artifact@v3 with: name: "alpine3.15" path: | - ~/packages/x86_64/wezterm-*.apk - ~/.abuild/*.pub + wezterm-*.apk + *.pub upload: runs-on: ubuntu-latest @@ -99,4 +105,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) ~/packages/x86_64/wezterm-*.apk ~/.abuild/*.pub" + run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) wezterm-*.apk *.pub" diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py index 39bb5e74b..acf6fb684 100755 --- a/ci/generate-workflows.py +++ b/ci/generate-workflows.py @@ -377,6 +377,19 @@ cargo build --all --release""", f"mv ~/rpmbuild/RPMS/*/*.rpm .", ) ) + elif "alpine" in self.name: + steps.append( + RunStep( + "Move APKs", + f"mv ~/packages/x86_64/*.apk .", + ) + ) + steps.append( + RunStep( + "Move APK keys", + f"mv ~/.abuild/*.pub .", + ) + ) patterns = self.asset_patterns() glob = " ".join(patterns) @@ -401,9 +414,9 @@ cargo build --all --release""", elif ("ubuntu" in self.name) or ("debian" in self.name): patterns += ["wezterm-*.deb", "wezterm-*.xz"] elif "alpine" in self.name: - patterns += ["~/packages/x86_64/wezterm-*.apk"] + patterns += ["wezterm-*.apk"] if self.is_tag: - patterns.append("~/.abuild/*.pub") + patterns.append("*.pub") if self.app_image: patterns.append("*src.tar.gz")