1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00

ci: tweak apk patterns/uploads/artifacts

This commit is contained in:
Wez Furlong 2022-04-18 22:18:22 -07:00
parent 724baf12b5
commit 6753bfe764
13 changed files with 87 additions and 26 deletions

View File

@ -77,8 +77,14 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.12" name: "alpine3.12"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"

View File

@ -84,7 +84,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.12" name: "alpine3.12"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"
retention-days: 5 retention-days: 5
upload: upload:
@ -105,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -68,13 +68,19 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.12" name: "alpine3.12"
path: | path: |
~/packages/x86_64/wezterm-*.apk wezterm-*.apk
~/.abuild/*.pub *.pub
upload: upload:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -99,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -77,8 +77,14 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.13" name: "alpine3.13"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"

View File

@ -84,7 +84,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.13" name: "alpine3.13"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"
retention-days: 5 retention-days: 5
upload: upload:
@ -105,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -68,13 +68,19 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.13" name: "alpine3.13"
path: | path: |
~/packages/x86_64/wezterm-*.apk wezterm-*.apk
~/.abuild/*.pub *.pub
upload: upload:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -99,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -77,8 +77,14 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.14" name: "alpine3.14"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"

View File

@ -84,7 +84,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.14" name: "alpine3.14"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"
retention-days: 5 retention-days: 5
upload: upload:
@ -105,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -68,13 +68,19 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.14" name: "alpine3.14"
path: | path: |
~/packages/x86_64/wezterm-*.apk wezterm-*.apk
~/.abuild/*.pub *.pub
upload: upload:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -99,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -77,8 +77,14 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.15" name: "alpine3.15"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"

View File

@ -84,7 +84,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.15" name: "alpine3.15"
path: "~/packages/x86_64/wezterm-*.apk" path: "wezterm-*.apk"
retention-days: 5 retention-days: 5
upload: upload:
@ -105,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -68,13 +68,19 @@ jobs:
- name: "Package" - name: "Package"
shell: bash shell: bash
run: "bash ci/deploy.sh" 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" - name: "Upload artifact"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "alpine3.15" name: "alpine3.15"
path: | path: |
~/packages/x86_64/wezterm-*.apk wezterm-*.apk
~/.abuild/*.pub *.pub
upload: upload:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -99,4 +105,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash 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"

View File

@ -377,6 +377,19 @@ cargo build --all --release""",
f"mv ~/rpmbuild/RPMS/*/*.rpm .", 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() patterns = self.asset_patterns()
glob = " ".join(patterns) glob = " ".join(patterns)
@ -401,9 +414,9 @@ cargo build --all --release""",
elif ("ubuntu" in self.name) or ("debian" in self.name): elif ("ubuntu" in self.name) or ("debian" in self.name):
patterns += ["wezterm-*.deb", "wezterm-*.xz"] patterns += ["wezterm-*.deb", "wezterm-*.xz"]
elif "alpine" in self.name: elif "alpine" in self.name:
patterns += ["~/packages/x86_64/wezterm-*.apk"] patterns += ["wezterm-*.apk"]
if self.is_tag: if self.is_tag:
patterns.append("~/.abuild/*.pub") patterns.append("*.pub")
if self.app_image: if self.app_image:
patterns.append("*src.tar.gz") patterns.append("*src.tar.gz")