Skip to content

Commit 062da84

Browse files
authored
Merge pull request #523 from mkroening/ci-loader-download
ci: download loader using GitHub CLI
2 parents 89124de + 1ca60a6 commit 062da84

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

.github/workflows/ci.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
merge_group:
66

77
env:
8+
GH_TOKEN: ${{ github.token }}
89
RUSTFLAGS: -Dwarnings
910
RUSTDOCFLAGS: -Dwarnings
1011

@@ -58,11 +59,8 @@ jobs:
5859
with:
5960
submodules: true
6061
- uses: mkroening/rust-toolchain-toml@main
61-
- name: Download loader
62-
uses: dsaltares/fetch-gh-release-asset@1.1.1
63-
with:
64-
repo: hermit-os/loader
65-
file: hermit-loader-x86_64
62+
- name: Download loader
63+
run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
6664
- name: Build dev profile
6765
run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
6866
- name: Install uhyve
@@ -131,10 +129,7 @@ jobs:
131129
sudo apt-get update
132130
sudo apt-get install ${{ matrix.packages }}
133131
- name: Download loader
134-
uses: dsaltares/fetch-gh-release-asset@master
135-
with:
136-
repo: hermit-os/loader
137-
file: hermit-loader-${{ matrix.arch }}
132+
run: gh release download --repo hermit-os/loader --pattern hermit-loader-${{ matrix.arch }}
138133
- uses: mkroening/rust-toolchain-toml@main
139134
- uses: mkroening/rust-toolchain-toml@main
140135
with:

.github/workflows/publish.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- main
77

88
env:
9+
GH_TOKEN: ${{ github.token }}
910
CARGO_TERM_COLOR: always
1011

1112
jobs:
@@ -28,10 +29,7 @@ jobs:
2829
- name: Copy demo out of target dir
2930
run: cp target/x86_64-unknown-hermit/release/rusty_demo .
3031
- name: Download loader
31-
uses: dsaltares/fetch-gh-release-asset@1.1.1
32-
with:
33-
repo: hermit-os/loader
34-
file: hermit-loader-x86_64
32+
run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
3533
- name: Create dockerfile for rusty_demo
3634
run: |
3735
cat << END > Dockerfile

0 commit comments

Comments
 (0)