-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Clean up Windows builds and re-add RISC-V * Fix GCC version detection * Comment out SSH auth as not necessary anymore
- Loading branch information
Showing
9 changed files
with
117 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,8 @@ permissions: | |
| contents: write | ||
|
|
||
| env: | ||
| SKIP_RISCV: 1 | ||
| SKIP_RISCV: 0 | ||
| SKIP_OPENOCD: 0 | ||
|
|
||
| jobs: | ||
| build_windows: | ||
|
|
@@ -17,13 +18,18 @@ jobs: | |
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| - name: Setup SSH Auth | ||
| if: runner.environment == 'github-hosted' | ||
| uses: webfactory/[email protected] | ||
| with: | ||
| ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| # - name: Setup SSH Auth | ||
| # if: runner.environment == 'github-hosted' | ||
| # uses: webfactory/[email protected] | ||
| # with: | ||
| # ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| - name: Setup MSYS2 | ||
| uses: msys2/setup-msys2@v2 | ||
| - name: Build | ||
| run: ./build.ps1 ./config/x64-win.json -SkipSigning | ||
| run: | | ||
| subst P: . | ||
| P: | ||
| ./build.ps1 ./config/x64-win.json -SkipSigning -MSYS2Path (msys2 -c 'cygpath -m /').TrimEnd('\/') | ||
| - name: Upload Artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
|
|
@@ -32,6 +38,7 @@ jobs: | |
| bin/picotool-*-x64-win.zip | ||
| bin/pico-sdk-tools-*-x64-win.zip | ||
| bin/openocd-*-x64-win.zip | ||
| bin/riscv-toolchain-*-x64-win.zip | ||
| - name: Add Release Asset | ||
| uses: softprops/action-gh-release@v2 | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
|
|
@@ -40,6 +47,7 @@ jobs: | |
| bin/picotool-*-x64-win.zip | ||
| bin/pico-sdk-tools-*-x64-win.zip | ||
| bin/openocd-*-x64-win.zip | ||
| bin/riscv-toolchain-*-x64-win.zip | ||
| build_macos: | ||
| name: Build MacOS | ||
|
|
@@ -57,11 +65,11 @@ jobs: | |
| if: runner.environment == 'github-hosted' | ||
| run: | | ||
| NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" | ||
| - name: Setup SSH Auth | ||
| if: runner.environment == 'github-hosted' | ||
| uses: webfactory/[email protected] | ||
| with: | ||
| ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| # - name: Setup SSH Auth | ||
| # if: runner.environment == 'github-hosted' | ||
| # uses: webfactory/[email protected] | ||
| # with: | ||
| # ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| - name: Build | ||
| run: ./build_macos.sh | ||
| - name: Upload Artifact | ||
|
|
@@ -96,11 +104,11 @@ jobs: | |
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| - name: Setup SSH Auth | ||
| if: runner.environment == 'github-hosted' | ||
| uses: webfactory/[email protected] | ||
| with: | ||
| ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| # - name: Setup SSH Auth | ||
| # if: runner.environment == 'github-hosted' | ||
| # uses: webfactory/[email protected] | ||
| # with: | ||
| # ssh-private-key: ${{ secrets.SSH_KEY }} | ||
| - name: Build | ||
| run: ./build_linux.sh | ||
| - name: Upload Artifact | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| { | ||
| "bitness": 64, | ||
| "mingwArch": "x86_64", | ||
| "msysEnv": "MINGW64", | ||
| "downloads": [ | ||
| { | ||
| "name": "CMake", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| # Find all directories with exe files | ||
| find . -name '*.exe' -printf '%h\n' | sort -u | while read i | ||
| do | ||
| echo "Copying DLLs to $i" | ||
| pushd "$i" > /dev/null | ||
|
|
||
| # We need to match just the DLL names, if they are from the MSYS2 libraries. | ||
| # (?<=...) is a positive lookbehind assertion, because we are looking for something like | ||
| # "libusb-1.0.dll => /mingw64/.../libusb-1.0.dll" | ||
| find . -maxdepth 1 -name '*.exe' -exec ldd {} ';' | (grep -Po "(?<==> )/${MSYSTEM,,}[^ ]+" || true) | sort -u | xargs -I{} cp -v {} . | ||
|
|
||
| popd > /dev/null | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| INSTALLDIR="riscv-install/${MSYSTEM,,}" | ||
| rm -rf $INSTALLDIR | ||
| mkdir -p $INSTALLDIR | ||
|
|
||
| BUILDDIR=$(pwd) | ||
|
|
||
| cd riscv-gnu-toolchain | ||
| ./configure --prefix=$BUILDDIR/$INSTALLDIR --with-arch=rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb --with-abi=ilp32 --with-multilib-generator="rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb-ilp32--;rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb-ilp32--" | ||
| make -j$(nproc) | ||
|
|
||
| cd "$BUILDDIR/$INSTALLDIR" | ||
| "$BUILDDIR/../packages/windows/copy-deps.sh" |