Skip to content

Commit

Permalink
ship toolchain. work around non-shipped toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
pipcet committed Jan 27, 2021
1 parent ae03c47 commit a0d9ee7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions .github/workflows/wasm32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,23 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

ship_toolchain:
name: ship toolchain
runs-on: ubuntu-latest
needs:
- ncurses
- bash
- tests
steps:
- uses: actions/checkout@v2
with:
submodules: false
- name: Set env variables
uses: ./github/env/
- run: make GITHUB=1 -kj10 ship-toolchain/latest!
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release:
name: release
runs-on: ubuntu-latest
Expand All @@ -826,6 +843,7 @@ jobs:
- ship_gcc
- ship_glibc
- ship_ncurses
- ship_toolchain
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ artifact-push!:
grep FAIL build/wasm32/gcc/gcc/testsuite/gcc/gcc.log > artifacts/$(notdir $*)-$$PREFIX-short.log || true
$(MAKE) artifact-push!

%.{daily-dejanew}!: js/wasm32.js install/texinfo-bison-flex install/gcc-dependencies install/dejagnu | extracted/daily/toolchain.tar.gz tools/bin/wasmrewrite tools/bin/wasmsect install/binfmt_misc/wasm install/binfmt_misc/elf32-wasm32 artifacts/libc.wasm artifacts/ld.wasm artifacts/libm.wasm subrepos/gcc/checkout! daily src/gcc
%.{daily-dejanew}!: js/wasm32.js install/texinfo-bison-flex install/gcc-dependencies install/dejagnu | extracted/daily/gcc.tar.gz extracted/daily/binutils.tar.gz extracted/daily/gcc-preliminary.tar.gz extracted/daily/glibc.tar.gz tools/bin/wasmrewrite tools/bin/wasmsect install/binfmt_misc/wasm install/binfmt_misc/elf32-wasm32 artifacts/libc.wasm artifacts/ld.wasm artifacts/libm.wasm subrepos/gcc/checkout! daily src/gcc
$(MAKE) bin/js
mkdir wasm
$(MAKE) wasm/ld.wasm
Expand Down

0 comments on commit a0d9ee7

Please sign in to comment.