Skip to content

Commit 3db4f10

Browse files
committed
use new array based scripts for clarity
1 parent 80d5d37 commit 3db4f10

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ jobs:
9494
strategy:
9595
matrix:
9696
platform: ${{ fromJson(needs.get-platform.outputs.test-matrix) }}
97+
name:
98+
test ${{ matrix.name-extra }}
9799
outputs:
98100
HAS_SECRETS: ${{ env.HAS_SECRETS }}
99101
container: ${{ matrix.platform.container }}

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- linux+aarch64
3333
needs: [get-projects]
3434
uses: ./.github/workflows/build.yml
35+
name: ${{ matrix.platform }}
3536
with:
3637
projects: ${{ needs.get-projects.outputs.diff || 'zlib.net^1.2' }}
3738
platform: ${{ matrix.platform }}

projects/fishshell.com/package.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,23 @@ build:
1717
freedesktop.org/pkg-config: '*'
1818
gnu.org/patch: '*'
1919
git-scm.org: ^2 # needed for fish's pcre
20-
script: |
20+
script:
2121
# By default, fish's fish_command_not_found handler will redirect to stderr,
2222
# return an exit code of 127. Always. This patch fixes it. Hopefully, it will
2323
# be merged upstream soon. https://github.com/fish-shell/fish-shell/pull/9517
24+
- patch -p1 <props/command_not_found_handler.diff
2425

25-
patch -p1 <props/command_not_found_handler.diff
26-
27-
echo {{version}} >version
28-
29-
mkdir build
30-
cd build
26+
- echo {{version}} >version
3127

32-
cmake .. $ARGS
33-
make install
28+
- run: |
29+
cmake .. $ARGS
30+
make install
31+
working-directory: build
3432
35-
cd {{prefix}}/share/fish
36-
sed -i.bak -e "s| $TEA_PREFIX/| (tea --prefix)/|g" __fish_build_paths.fish
37-
rm __fish_build_paths.fish.bak
33+
- run: |
34+
sed -i.bak -e "s| $TEA_PREFIX/| \$TEA_PREFIX/|g" __fish_build_paths.fish
35+
rm __fish_build_paths.fish.bak
36+
working-directory: ${{prefix}}/share/fish
3837
env:
3938
ARGS:
4039
- -DCMAKE_BUILD_TYPE=Release

0 commit comments

Comments
 (0)