use new array based scripts for clarity

This commit is contained in:
Max Howell 2023-04-20 02:47:52 -04:00
parent 80d5d37576
commit 3db4f100bc
3 changed files with 14 additions and 12 deletions

View file

@ -94,6 +94,8 @@ jobs:
strategy:
matrix:
platform: ${{ fromJson(needs.get-platform.outputs.test-matrix) }}
name:
test ${{ matrix.name-extra }}
outputs:
HAS_SECRETS: ${{ env.HAS_SECRETS }}
container: ${{ matrix.platform.container }}

View file

@ -32,6 +32,7 @@ jobs:
- linux+aarch64
needs: [get-projects]
uses: ./.github/workflows/build.yml
name: ${{ matrix.platform }}
with:
projects: ${{ needs.get-projects.outputs.diff || 'zlib.net^1.2' }}
platform: ${{ matrix.platform }}

View file

@ -17,24 +17,23 @@ build:
freedesktop.org/pkg-config: '*'
gnu.org/patch: '*'
git-scm.org: ^2 # needed for fish's pcre
script: |
script:
# By default, fish's fish_command_not_found handler will redirect to stderr,
# return an exit code of 127. Always. This patch fixes it. Hopefully, it will
# be merged upstream soon. https://github.com/fish-shell/fish-shell/pull/9517
- patch -p1 <props/command_not_found_handler.diff
patch -p1 <props/command_not_found_handler.diff
- echo {{version}} >version
echo {{version}} >version
- run: |
cmake .. $ARGS
make install
working-directory: build
mkdir build
cd build
cmake .. $ARGS
make install
cd {{prefix}}/share/fish
sed -i.bak -e "s| $TEA_PREFIX/| (tea --prefix)/|g" __fish_build_paths.fish
rm __fish_build_paths.fish.bak
- run: |
sed -i.bak -e "s| $TEA_PREFIX/| \$TEA_PREFIX/|g" __fish_build_paths.fish
rm __fish_build_paths.fish.bak
working-directory: ${{prefix}}/share/fish
env:
ARGS:
- -DCMAKE_BUILD_TYPE=Release