diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 4c5c93a10b..2fbe65673a 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -28,7 +28,7 @@ env: jobs: build: - name: Building AppImage + name: build (${{ matrix.id }}) strategy: fail-fast: false matrix: @@ -38,7 +38,7 @@ jobs: - os: ubuntu-24.04-arm id: aarch64 - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} container: ghcr.io/pkgforge-dev/archlinux:latest steps: @@ -58,7 +58,7 @@ jobs: echo "count=$(git tag -l 'v[0-9]*' | wc -l | tr -d ' ')" >> $GITHUB_OUTPUT - name: Fetch upstream tags # required for git describe to return a valid version and to preevnt androidGitVersion from crashing on a new fork - if: ${{ steps.valid-tags.outputs.count == '0' }} + if: steps.valid-tags.outputs.count == '0' run: | # TODO: should try to fetch tags from whereever this repo was forked from before fetching from official repo git remote add upstream https://github.com/hrydgard/ppsspp.git # fetching from official repo as a fallback @@ -162,7 +162,6 @@ jobs: echo "Building..." uname -m echo "tag=$(git describe --always --tags)" >> $GITHUB_OUTPUT - echo "isTag=${{ startsWith(github.ref, 'refs/tags/') }}" >> $GITHUB_OUTPUT # Export ccache env var(s) export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" @@ -196,15 +195,15 @@ jobs: echo "Creating AppImage..." chmod +x ./build/PPSSPPSDL chmod +x ./scripts/makeappimage_64-bit.sh - VERSION=$([ "${{ steps.version.outputs.isTag }}" == "true" ] && echo "${GITHUB_REF##*/}" || echo "${{ steps.version.outputs.tag }}") + VERSION=$([[ ${GITHUB_REF_TYPE} == tag ]] && echo "$GITHUB_REF_NAME" || echo "${{ steps.version.outputs.tag }}") echo "Version = $VERSION" ./scripts/makeappimage_64-bit.sh "$VERSION" - name: Prepare artifacts run: | find . -name "PPSSPPSDL" - find . -name "PPSSPP*.AppImage" -exec chmod +x {} \; - find . -name "PPSSPP*.AppBundle" -exec chmod +x {} \; + find . -name "PPSSPP*.AppImage" -exec chmod +x '{}' \; + find . -name "PPSSPP*.AppBundle" -exec chmod +x '{}' \; find . -name "PPSSPP*.zsync" mkdir artifacts if [ -e ./PPSSPP*.AppImage ]; then @@ -225,7 +224,7 @@ jobs: - name: Upload release uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2 - if: startsWith(github.ref, 'refs/tags/') + if: github.ref_type == 'tag' with: token: ${{ secrets.GITHUB_TOKEN }} files: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ade4ef6a99..5ed374a485 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,6 +111,7 @@ jobs: run: python test.py -g --graphics=software build: + name: build (${{ matrix.id }}) strategy: fail-fast: false matrix: @@ -219,14 +220,14 @@ jobs: - name: Install Linux dependencies if: runner.os == 'Linux' && matrix.extra != 'android' run: | - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" + sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" sudo apt-get update -y -qq sudo apt-get install libsdl2-dev libgl1-mesa-dev libglu1-mesa-dev libsdl2-ttf-dev libfontconfig1-dev - name: Create macOS git-version.cpp for tagged release - if: startsWith(github.ref, 'refs/tags/') && runner.os == 'macOS' && matrix.extra == 'test' + if: github.ref_type == 'tag' && runner.os == 'macOS' && matrix.extra == 'test' run: | - echo "const char *PPSSPP_GIT_VERSION = \"${GITHUB_REF##*/}\";" > git-version.cpp + echo "const char *PPSSPP_GIT_VERSION = \"${GITHUB_REF_NAME}\";" > git-version.cpp echo "#define PPSSPP_GIT_VERSION_NO_UPDATE 1" >> git-version.cpp - name: Setup ccache @@ -267,10 +268,10 @@ jobs: elif [ -e build*/PPSSPPSDL.app ]; then cp -a build*/PPSSPPSDL.app ppsspp/ # GitHub Actions zipping kills symlinks and permissions. - cd ppsspp + pushd ppsspp zip -qry PPSSPPSDL.zip PPSSPPSDL.app rm -rf PPSSPPSDL.app - cd - + popd elif [ -e build*/PPSSPPSDL ]; then cp build*/PPSSPPSDL ppsspp/ cp -r assets ppsspp/assets @@ -294,14 +295,13 @@ jobs: path: ppsspp/ - name: Create macOS release - if: startsWith(github.ref, 'refs/tags/') && runner.os == 'macOS' && matrix.extra == 'test' - run: | - cd ppsspp || exit 1 - mv PPSSPPSDL.zip PPSSPPSDL-macOS-${GITHUB_REF##*/}.zip || exit 1 + if: github.ref_type == 'tag' && runner.os == 'macOS' && matrix.extra == 'test' + working-directory: ppsspp + run: mv PPSSPPSDL.zip PPSSPPSDL-macOS-${GITHUB_REF_NAME}.zip - name: Upload macOS release uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2 - if: startsWith(github.ref, 'refs/tags/') && runner.os == 'macOS' && matrix.extra == 'test' + if: github.ref_type == 'tag' && runner.os == 'macOS' && matrix.extra == 'test' with: files: ppsspp/*.zip body: > @@ -333,7 +333,7 @@ jobs: - name: Install Linux dependencies if: runner.os == 'Linux' run: | - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" + sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" sudo apt-get update -y -qq sudo apt-get install libsdl2-dev libgl1-mesa-dev libglu1-mesa-dev libsdl2-ttf-dev libfontconfig1-dev @@ -365,7 +365,7 @@ jobs: working-directory: ${{ env.GITHUB_WORKSPACE }} run: python test.py -g --graphics=software - build_test_headless_alpine: + test-headless-alpine: runs-on: ubuntu-latest container: image: alpine:latest diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index f33bf676f6..3d57058368 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -34,7 +34,7 @@ jobs: echo "count=$(git tag -l 'v[0-9]*' | wc -l | tr -d ' ')" >> $GITHUB_OUTPUT - name: Fetch upstream tags # required for git describe to return a valid version and to preevnt androidGitVersion from crashing on a new fork - if: ${{ steps.valid-tags.outputs.count == '0' }} + if: steps.valid-tags.outputs.count == '0' run: | # TODO: should try to fetch tags from whereever this repo was forked from before fetching from official repo git remote add upstream https://github.com/hrydgard/ppsspp.git # fetching from official repo as a fallback diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index 4882e3f39f..370708e724 100644 --- a/.github/workflows/manual_generate_ipa.yml +++ b/.github/workflows/manual_generate_ipa.yml @@ -31,7 +31,7 @@ jobs: echo "count=$(git tag -l 'v[0-9]*' | wc -l | tr -d ' ')" >> $GITHUB_OUTPUT - name: Fetch upstream tags # required for git describe to return a valid version on a new fork - if: ${{ steps.valid-tags.outputs.count == '0' }} + if: steps.valid-tags.outputs.count == '0' run: | # TODO: should try to fetch tags from whereever this repo was forked from before fetching from official repo git remote add upstream https://github.com/hrydgard/ppsspp.git # fetching from official repo as a fallback @@ -50,18 +50,18 @@ jobs: mkdir build-ios/PPSSPP.app echo $(echo $GIT_VERSION | cut -c 2-) > build-ios/PPSSPP.app/Version.txt # Testing values ... - echo "Content of [GITHUB_REF##*/] = ${GITHUB_REF##*/}" + echo "Content of [GITHUB_REF_NAME] = ${GITHUB_REF_NAME}" echo "count=${{steps.valid-tags.outputs.count}}" echo $(echo $GIT_VERSION | cut -c 2-) # Testing file location ... find . -name "Version.txt" - + - name: Setup ccache uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18 with: key: ios create-symlink: true - + - name: Execute build env: CC: clang @@ -85,10 +85,10 @@ jobs: mkdir ppsspp/Payload cp -a build*/PPSSPP.app ppsspp/Payload # GitHub Actions zipping kills symlinks and permissions. - cd ppsspp + pushd ppsspp zip -qry PPSSPP.ipa Payload rm -rf Payload - cd - + popd fi - name: Upload artifact diff --git a/.github/workflows/manual_generate_uwp.yml b/.github/workflows/manual_generate_uwp.yml index b83513b0ec..04b5b05c34 100644 --- a/.github/workflows/manual_generate_uwp.yml +++ b/.github/workflows/manual_generate_uwp.yml @@ -48,7 +48,7 @@ jobs: echo "count=$(git tag -l 'v[0-9]*' | wc -l | tr -d ' ')" >> $GITHUB_OUTPUT # $env:GITHUB_OUTPUT on pwsh - name: Fetch upstream tags # required for git describe to return a valid version on a new fork - if: ${{ steps.valid-tags.outputs.count == '0' }} + if: steps.valid-tags.outputs.count == '0' run: | # TODO: should try to fetch tags from whereever this repo was forked from before fetching from official repo git remote add upstream https://github.com/hrydgard/ppsspp.git # fetching from official repo as a fallback @@ -84,7 +84,7 @@ jobs: working-directory: ${{ github.workspace }} env: INCLUDE_SYMBOLS: ${{ github.event.inputs.buildConfiguration == 'Debug' && 'true' || 'false' }} - if: ${{ github.event.inputs.buildPlatform != 'Bundle' }} + if: github.event.inputs.buildPlatform != 'Bundle' run: | echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}" msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=${{ github.event.inputs.buildPlatform }} /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=${{ github.event.inputs.signedPackage }} /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Never /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="${{ github.event.inputs.buildPlatform }}" @@ -93,7 +93,7 @@ jobs: working-directory: ${{ github.workspace }} env: INCLUDE_SYMBOLS: ${{ github.event.inputs.buildConfiguration == 'Debug' && 'true' || 'false' }} - if: ${{ github.event.inputs.buildPlatform == 'Bundle' }} + if: github.event.inputs.buildPlatform == 'Bundle' run: | echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}" msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=x64 /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=${{ github.event.inputs.signedPackage }} /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="x64|ARM64|ARM" diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml index 7cd4eb2a85..10ef2a85aa 100644 --- a/.github/workflows/tarball.yml +++ b/.github/workflows/tarball.yml @@ -11,7 +11,6 @@ on: jobs: build: - name: build runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -21,10 +20,10 @@ jobs: - name: Archive id: archive run: | - VERSION=${GITHUB_REF##*/} + VERSION=$GITHUB_REF_NAME test -z "$VERSION" && VERSION=${{ github.event.release.tag_name }} VERSION=$(printf "%s\n" "$VERSION" | sed 's/^v//') - PKGNAME="ppsspp-$VERSION" + PKGNAME=ppsspp-$VERSION mkdir -p /tmp/$PKGNAME mv * /tmp/$PKGNAME mv /tmp/$PKGNAME .