Skip to content

Commit

Permalink
Merge pull request #523 from mkroening/ci-loader-download
Browse files Browse the repository at this point in the history
ci: download loader using GitHub CLI
  • Loading branch information
mkroening authored Jan 26, 2024
2 parents 89124de + 1ca60a6 commit 062da84
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
merge_group:

env:
GH_TOKEN: ${{ github.token }}
RUSTFLAGS: -Dwarnings
RUSTDOCFLAGS: -Dwarnings

Expand Down Expand Up @@ -58,11 +59,8 @@ jobs:
with:
submodules: true
- uses: mkroening/rust-toolchain-toml@main
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@1.1.1
with:
repo: hermit-os/loader
file: hermit-loader-x86_64
- name: Download loader
run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
- name: Build dev profile
run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
- name: Install uhyve
Expand Down Expand Up @@ -131,10 +129,7 @@ jobs:
sudo apt-get update
sudo apt-get install ${{ matrix.packages }}
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: hermit-os/loader
file: hermit-loader-${{ matrix.arch }}
run: gh release download --repo hermit-os/loader --pattern hermit-loader-${{ matrix.arch }}
- uses: mkroening/rust-toolchain-toml@main
- uses: mkroening/rust-toolchain-toml@main
with:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- main

env:
GH_TOKEN: ${{ github.token }}
CARGO_TERM_COLOR: always

jobs:
Expand All @@ -28,10 +29,7 @@ jobs:
- name: Copy demo out of target dir
run: cp target/x86_64-unknown-hermit/release/rusty_demo .
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@1.1.1
with:
repo: hermit-os/loader
file: hermit-loader-x86_64
run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
- name: Create dockerfile for rusty_demo
run: |
cat << END > Dockerfile
Expand Down

0 comments on commit 062da84

Please sign in to comment.