mirror of
https://github.com/ivabus/pantry
synced 2024-11-26 18:25:08 +03:00
use new array based scripts for clarity
This commit is contained in:
parent
80d5d37576
commit
3db4f100bc
3 changed files with 14 additions and 12 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -94,6 +94,8 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: ${{ fromJson(needs.get-platform.outputs.test-matrix) }}
|
platform: ${{ fromJson(needs.get-platform.outputs.test-matrix) }}
|
||||||
|
name:
|
||||||
|
test ${{ matrix.name-extra }}
|
||||||
outputs:
|
outputs:
|
||||||
HAS_SECRETS: ${{ env.HAS_SECRETS }}
|
HAS_SECRETS: ${{ env.HAS_SECRETS }}
|
||||||
container: ${{ matrix.platform.container }}
|
container: ${{ matrix.platform.container }}
|
||||||
|
|
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -32,6 +32,7 @@ jobs:
|
||||||
- linux+aarch64
|
- linux+aarch64
|
||||||
needs: [get-projects]
|
needs: [get-projects]
|
||||||
uses: ./.github/workflows/build.yml
|
uses: ./.github/workflows/build.yml
|
||||||
|
name: ${{ matrix.platform }}
|
||||||
with:
|
with:
|
||||||
projects: ${{ needs.get-projects.outputs.diff || 'zlib.net^1.2' }}
|
projects: ${{ needs.get-projects.outputs.diff || 'zlib.net^1.2' }}
|
||||||
platform: ${{ matrix.platform }}
|
platform: ${{ matrix.platform }}
|
||||||
|
|
|
@ -17,24 +17,23 @@ build:
|
||||||
freedesktop.org/pkg-config: '*'
|
freedesktop.org/pkg-config: '*'
|
||||||
gnu.org/patch: '*'
|
gnu.org/patch: '*'
|
||||||
git-scm.org: ^2 # needed for fish's pcre
|
git-scm.org: ^2 # needed for fish's pcre
|
||||||
script: |
|
script:
|
||||||
# By default, fish's fish_command_not_found handler will redirect to stderr,
|
# 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
|
# 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
|
# 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
|
|
||||||
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
|
|
||||||
|
- run: |
|
||||||
cmake .. $ARGS
|
cmake .. $ARGS
|
||||||
make install
|
make install
|
||||||
|
working-directory: build
|
||||||
|
|
||||||
cd {{prefix}}/share/fish
|
- run: |
|
||||||
sed -i.bak -e "s| $TEA_PREFIX/| (tea --prefix)/|g" __fish_build_paths.fish
|
sed -i.bak -e "s| $TEA_PREFIX/| \$TEA_PREFIX/|g" __fish_build_paths.fish
|
||||||
rm __fish_build_paths.fish.bak
|
rm __fish_build_paths.fish.bak
|
||||||
|
working-directory: ${{prefix}}/share/fish
|
||||||
env:
|
env:
|
||||||
ARGS:
|
ARGS:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
Loading…
Reference in a new issue