Skip to content

Commit

Permalink
Update action versions and more shellcheck fixes
Browse files Browse the repository at this point in the history
Update action versions to latest.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
  • Loading branch information
bhundven committed Mar 5, 2024
1 parent 6abe3bb commit 5a43a51
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build-toolchains.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ jobs:
run: |
cd ..
rmdir crosstool-ng
hdiutil create ${HOME}/Workspace.sparseimage -volname crosstool-ng -type SPARSE -size 20g -fs HFSX
hdiutil mount ${HOME}/Workspace.sparseimage -mountroot /Users/runner/work/crosstool-ng
hdiutil create "${HOME}/Workspace.sparseimage" -volname crosstool-ng -type SPARSE -size 20g -fs HFSX
hdiutil mount "${HOME}/Workspace.sparseimage" -mountroot /Users/runner/work/crosstool-ng
cd crosstool-ng
- name: download ct-ng
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: crosstool.${{ matrix.host }}
- name: extract ct-ng
run: |
tar -xf ct-ng.tar
- name: download tarballs
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: src.tar
key: src.tar-${{ hashFiles('.local/share/crosstool-ng/packages') }}-${{ hashFiles('.local/share/crosstool-ng/samples') }}
Expand All @@ -67,16 +67,16 @@ jobs:
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install -y gperf help2man libtool-bin meson ninja-build
echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/.local/bin" >> "$GITHUB_PATH"
- name: prereq macOS
if: ${{ runner.os == 'macOS' }}
run: |
brew install autoconf automake bash binutils gawk gnu-sed \
gnu-tar help2man make ncurses pkg-config
echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/.local/bin" >> "$GITHUB_PATH"
- name: download x86_64-w64-mingw32.${{ matrix.host }} tarball
if: ${{ inputs.canadian-cross }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: x86_64-w64-mingw32.${{ matrix.host }}.tar
- name: install x86_64-w64-mingw32.${{ matrix.host }} toolchain
Expand All @@ -85,7 +85,7 @@ jobs:
mkdir -p ${{ github.workspace }}/x86_64-w64-mingw32
tar -C ${{ github.workspace }}/x86_64-w64-mingw32 \
-xf x86_64-w64-mingw32.${{ matrix.host }}.tar
echo "${{ github.workspace }}/x86_64-w64-mingw32/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/x86_64-w64-mingw32/bin" >> "$GITHUB_PATH"
- name: build ${{ matrix.sample }} for ${{ matrix.host }}
run: |
mkdir -p src
Expand All @@ -103,13 +103,13 @@ jobs:
-cf ${{ matrix.sample }}.${{ matrix.host }}.tar .
- name: upload ${{ matrix.sample }}.${{ matrix.host }} tarball
if: ${{ matrix.sample == 'x86_64-w64-mingw32' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.sample }}.${{ matrix.host }}.tar
path: |
${{ matrix.sample }}.${{ matrix.host }}.tar
- name: upload log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.sample }}.${{ matrix.host }}.log
path: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
host: ["ubuntu-22.04", "macos-latest"]
steps:
- name: "clone"
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: "prereq Linux"
if: ${{ runner.os == 'Linux' }}
run: |
Expand All @@ -39,12 +39,12 @@ jobs:
make install
tar -cf ct-ng.tar .local/
- name: "upload ct-ng"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: crosstool.${{ matrix.host }}
path: ct-ng.tar
- name: "upload config.log"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: config.log.${{ matrix.host }}
path: config.log
Expand All @@ -58,15 +58,15 @@ jobs:
host: ["ubuntu-22.04"]
steps:
- name: "download ct-ng"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: crosstool.${{ matrix.host }}
- name: "extract ct-ng"
run: |
tar -xf ct-ng.tar
- name: cache tarballs
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: src.tar
key: src.tar-${{ hashFiles('.local/share/crosstool-ng/packages') }}-${{ hashFiles('.local/share/crosstool-ng/samples') }}
Expand All @@ -81,7 +81,7 @@ jobs:
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install -y gperf help2man libtool-bin
echo "$GITHUB_WORKSPACE/.local/bin" >> $GITHUB_PATH
echo "$GITHUB_WORKSPACE/.local/bin" >> "$GITHUB_PATH"
- name: "ct-ng source"
run: |
mkdir -p src
Expand Down

0 comments on commit 5a43a51

Please sign in to comment.