Rename actions folder as scripts

It's clearer this way.
This commit is contained in:
ISSOtm
2022-10-16 11:10:15 +02:00
committed by Eldred Habert
parent c8e602dec1
commit 0f86084e08
6 changed files with 6 additions and 6 deletions

View File

@@ -9,7 +9,7 @@ arch="$1"
wget http://downloads.sourceforge.net/project/libpng/libpng16/$pngver/libpng-$pngver.tar.xz wget http://downloads.sourceforge.net/project/libpng/libpng16/$pngver/libpng-$pngver.tar.xz
wget http://downloads.sourceforge.net/project/apng/libpng/libpng16/libpng-$pngver-apng.patch.gz wget http://downloads.sourceforge.net/project/apng/libpng/libpng16/libpng-$pngver-apng.patch.gz
sha256sum -c .github/actions/mingw-w64-libpng-dev.sha256sums sha256sum -c .github/scripts/mingw-w64-libpng-dev.sha256sums
## Extract sources and patch them ## Extract sources and patch them

View File

@@ -99,7 +99,7 @@ jobs:
- name: Install deps - name: Install deps
shell: bash shell: bash
run: | run: |
./.github/actions/install_deps.sh macos-latest ./.github/scripts/install_deps.sh macos-latest
# We force linking libpng statically; the other libs are provided by macOS itself # We force linking libpng statically; the other libs are provided by macOS itself
- name: Build binaries - name: Build binaries
run: | run: |
@@ -107,7 +107,7 @@ jobs:
make -j WARNFLAGS="-Wall -Wextra -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q= make -j WARNFLAGS="-Wall -Wextra -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
- name: Package binaries - name: Package binaries
run: | run: |
zip --junk-paths rgbds-${{ env.version }}-macos-x86-64.zip rgb{asm,link,fix,gfx} man/* .github/actions/install.sh zip --junk-paths rgbds-${{ env.version }}-macos-x86-64.zip rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh
- name: Upload macOS binaries - name: Upload macOS binaries
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:

View File

@@ -28,7 +28,7 @@ jobs:
- name: Install deps - name: Install deps
shell: bash shell: bash
run: | run: |
./.github/actions/install_deps.sh ${{ matrix.os }} ./.github/scripts/install_deps.sh ${{ matrix.os }}
# The `export` lines are to allow working on macOS... # The `export` lines are to allow working on macOS...
# Apple's base version is severely outdated, not even supporting -Wall, # Apple's base version is severely outdated, not even supporting -Wall,
# but it overrides Homebrew's version nonetheless... # but it overrides Homebrew's version nonetheless...
@@ -166,13 +166,13 @@ jobs:
- name: Install deps - name: Install deps
shell: bash shell: bash
run: | run: |
./.github/actions/install_deps.sh ${{ matrix.os }} ./.github/scripts/install_deps.sh ${{ matrix.os }}
- name: Install MinGW - name: Install MinGW
run: | # dpkg-dev is apparently required for pkg-config for cross-building run: | # dpkg-dev is apparently required for pkg-config for cross-building
sudo apt-get install {gcc,g++}-mingw-w64-${{ matrix.arch }}-win32 mingw-w64-tools libz-mingw-w64-dev dpkg-dev sudo apt-get install {gcc,g++}-mingw-w64-${{ matrix.arch }}-win32 mingw-w64-tools libz-mingw-w64-dev dpkg-dev
- name: Install libpng dev headers for MinGW - name: Install libpng dev headers for MinGW
run: | run: |
sudo ./.github/actions/mingw-w64-libpng-dev.sh ${{ matrix.triplet }} sudo ./.github/scripts/mingw-w64-libpng-dev.sh ${{ matrix.triplet }}
- name: Cross-build Windows binaries - name: Cross-build Windows binaries
run: | run: |
make mingw${{ matrix.bits }} -j Q= make mingw${{ matrix.bits }} -j Q=