@@ -51,22 +51,22 @@ jobs:
5151 continue-on-error : true
5252
5353 - name : Install x-compile system build dependencies
54- if : ${{ matrix.target-platform == 'Windows-x86_64 ' }}
54+ if : ${{ matrix.target-os == 'Windows' }}
5555 run : |
5656 sudo apt-get install -y mingw-w64
5757 # If there are other dependencies, we should add them here and make sure the documentation is updated!
5858
5959 # https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-ruby
6060 - name : Set up Ruby
61- if : ${{ matrix.target-platform != 'Windows-x86_64 ' }}
61+ if : ${{ matrix.target-os != 'Windows' }}
6262 uses : ruby/setup-ruby@v1
6363 with :
6464 bundler-cache : true
6565 ruby-version : ' 3.3'
6666 continue-on-error : true
6767
6868 - name : Install Package Creator
69- if : ${{ matrix.target-platform != 'Windows-x86_64 ' }}
69+ if : ${{ matrix.target-os != 'Windows' }}
7070 run : |
7171 echo installing jordansissel/fpm ruby package
7272 gem install fpm
@@ -103,7 +103,7 @@ jobs:
103103 echo "MAKE_VERSION=4.4" >> $GITHUB_OUTPUT
104104 continue-on-error : false
105105
106- - name : Build N64 MIPS GCC toolchain for ${{ matrix.target-platform }}
106+ - name : Build N64 MIPS GCC toolchain for ${{ matrix.target-os }}-${{ matrix.target- platform }}
107107 run : |
108108 # required for newlib (as not the default?!)
109109 export PATH="$PATH:${{ runner.temp }}/${{ env.Install_Directory }}"
@@ -120,7 +120,7 @@ jobs:
120120 # https://fpm.readthedocs.io/en/v1.15.0/getting-started.html
121121 # TODO: add --deb-changelog with versions (like we do in release)
122122 - name : Generate toolchain packages for Linux based OS
123- if : ${{ matrix.target-platform == 'Linux-x86_64 ' }}
123+ if : ${{ matrix.target-os == 'Linux' }}
124124 run : |
125125 echo Generate environment var file
126126 echo 'export N64_INST=${{ env.Package_Installation_Directory }}' > "$Package_Name-env.sh"
@@ -166,26 +166,26 @@ jobs:
166166 Package_Name : gcc-toolchain-mips64
167167 Package_Version : ${{ steps.gcc-version-generator.outputs.GCC_VERSION }}
168168 Package_Revision : ${{ github.run_id }}
169- Package_Architecture : x86_64
169+ Package_Architecture : ${{ matrix.target-platform }}
170170 Package_License : GPL
171171 Package_Description : MIPS GCC toolchain for the N64
172172 Package_Url : https://n64brew.com
173173 Package_Maintainer : N64 Brew Community
174174
175175 - name : Publish Windows-x86_64 Build Artifact
176- if : ${{ matrix.target-platform == 'Windows-x86_64 ' }}
176+ if : ${{ matrix.target-os == 'Windows' }}
177177 uses : actions/upload-artifact@v4
178178 with :
179- name : gcc-toolchain-mips64-${{ matrix.target-platform }}
179+ name : gcc-toolchain-mips64-${{ matrix.target-os }}-${{ matrix.target- platform }}
180180 path : |
181181 ${{ runner.temp }}/${{ env.Install_Directory }}
182182 continue-on-error : true
183183
184- - name : Publish Linux-x86_64 Build Artifacts
185- if : ${{ matrix.target-platform == 'Linux-x86_64 ' }}
184+ - name : Publish ${{ matrix.target-os }}-${{ matrix.target-platform }} Build Artifacts
185+ if : ${{ matrix.target-os == 'Linux' }}
186186 uses : actions/upload-artifact@v4
187187 with :
188- name : gcc-toolchain-mips64-${{ matrix.target-platform }}
188+ name : gcc-toolchain-mips64-${{ matrix.target-os }}-${{ matrix.target- platform }}
189189 path : |
190190 ./**/*.deb
191191 ./**/*.rpm
0 commit comments