From 0f86084e08c20bbba44c60c981776c54e7101aab Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 16 Oct 2022 11:10:15 +0200 Subject: [PATCH] Rename `actions` folder as `scripts` It's clearer this way. --- .github/{actions => scripts}/install.sh | 0 .github/{actions => scripts}/install_deps.sh | 0 .github/{actions => scripts}/mingw-w64-libpng-dev.sh | 2 +- .../{actions => scripts}/mingw-w64-libpng-dev.sha256sums | 0 .github/workflows/create-release-artifacts.yaml | 4 ++-- .github/workflows/testing.yml | 6 +++--- 6 files changed, 6 insertions(+), 6 deletions(-) rename .github/{actions => scripts}/install.sh (100%) rename .github/{actions => scripts}/install_deps.sh (100%) rename .github/{actions => scripts}/mingw-w64-libpng-dev.sh (93%) rename .github/{actions => scripts}/mingw-w64-libpng-dev.sha256sums (100%) diff --git a/.github/actions/install.sh b/.github/scripts/install.sh similarity index 100% rename from .github/actions/install.sh rename to .github/scripts/install.sh diff --git a/.github/actions/install_deps.sh b/.github/scripts/install_deps.sh similarity index 100% rename from .github/actions/install_deps.sh rename to .github/scripts/install_deps.sh diff --git a/.github/actions/mingw-w64-libpng-dev.sh b/.github/scripts/mingw-w64-libpng-dev.sh similarity index 93% rename from .github/actions/mingw-w64-libpng-dev.sh rename to .github/scripts/mingw-w64-libpng-dev.sh index 82b485bc..38f87611 100755 --- a/.github/actions/mingw-w64-libpng-dev.sh +++ b/.github/scripts/mingw-w64-libpng-dev.sh @@ -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/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 diff --git a/.github/actions/mingw-w64-libpng-dev.sha256sums b/.github/scripts/mingw-w64-libpng-dev.sha256sums similarity index 100% rename from .github/actions/mingw-w64-libpng-dev.sha256sums rename to .github/scripts/mingw-w64-libpng-dev.sha256sums diff --git a/.github/workflows/create-release-artifacts.yaml b/.github/workflows/create-release-artifacts.yaml index cc8e5b15..99f3c523 100644 --- a/.github/workflows/create-release-artifacts.yaml +++ b/.github/workflows/create-release-artifacts.yaml @@ -99,7 +99,7 @@ jobs: - name: Install deps shell: bash 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 - name: Build binaries 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= - name: Package binaries 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 uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 62df2c6f..68bf997d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -28,7 +28,7 @@ jobs: - name: Install deps shell: bash run: | - ./.github/actions/install_deps.sh ${{ matrix.os }} + ./.github/scripts/install_deps.sh ${{ matrix.os }} # The `export` lines are to allow working on macOS... # Apple's base version is severely outdated, not even supporting -Wall, # but it overrides Homebrew's version nonetheless... @@ -166,13 +166,13 @@ jobs: - name: Install deps shell: bash run: | - ./.github/actions/install_deps.sh ${{ matrix.os }} + ./.github/scripts/install_deps.sh ${{ matrix.os }} - name: Install MinGW 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 - name: Install libpng dev headers for MinGW 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 run: | make mingw${{ matrix.bits }} -j Q=