-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(cherry picked from commit 01284fa)
- Loading branch information
Showing
16 changed files
with
2,368 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| name: 'Setup ninja' | ||
| description: 'Download ninja and add it to the PATH environment variable' | ||
| inputs: | ||
| version: | ||
| description: 'Ninja version' | ||
| default: '1.12.1' | ||
| runs: | ||
| using: 'composite' | ||
| steps: | ||
| - name: 'Calculate variables' | ||
| id: calc | ||
| shell: sh | ||
| run: | | ||
| case "${{ runner.os }}-${{ runner.arch }}" in | ||
| "Linux-X86" | "Linux-X64") | ||
| archive="ninja-linux.zip" | ||
| ;; | ||
| "Linux-ARM64") | ||
| archive="ninja-linux-aarch64.zip" | ||
| ;; | ||
| "macOS-X86" | "macOS-X64" | "macOS-ARM64") | ||
| archive="ninja-mac.zip" | ||
| ;; | ||
| "Windows-X86" | "Windows-X64") | ||
| archive="ninja-win.zip" | ||
| ;; | ||
| "Windows-ARM64") | ||
| archive="ninja-winarm64.zip" | ||
| ;; | ||
| *) | ||
| echo "Unsupported ${{ runner.os }}-${{ runner.arch }}" | ||
| exit 1; | ||
| ;; | ||
| esac | ||
| echo "archive=${archive}" >> ${GITHUB_OUTPUT} | ||
| echo "cache-key=${archive}-${{ inputs.version }}-${{ runner.os }}-${{ runner.arch }}" >> ${GITHUB_OUTPUT} | ||
| - name: 'Restore cached ${{ steps.calc.outputs.archive }}' | ||
| id: cache-restore | ||
| uses: actions/cache/restore@v4 | ||
| with: | ||
| path: '${{ runner.temp }}/${{ steps.calc.outputs.archive }}' | ||
| key: ${{ steps.calc.outputs.cache-key }} | ||
| - name: 'Download ninja ${{ inputs.version }} for ${{ runner.os }} (${{ runner.arch }})' | ||
| if: ${{ (!steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false') }} | ||
| shell: pwsh | ||
| run: | | ||
| Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v${{ inputs.version }}/${{ steps.calc.outputs.archive }}" -OutFile "${{ runner.temp }}/${{ steps.calc.outputs.archive }}" | ||
| - name: 'Cache ${{ steps.calc.outputs.archive }}' | ||
| if: ${{ (!steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false') }} | ||
| uses: actions/cache/save@v4 | ||
| with: | ||
| path: '${{ runner.temp }}/${{ steps.calc.outputs.archive }}' | ||
| key: ${{ steps.calc.outputs.cache-key }} | ||
| - name: 'Extract ninja' | ||
| shell: pwsh | ||
| run: | | ||
| 7z "-o${{ runner.temp }}/ninja-${{ inputs.version }}-${{ runner.arch }}" x "${{ runner.temp }}/${{ steps.calc.outputs.archive }}" | ||
| - name: 'Set output variables' | ||
| id: final | ||
| shell: pwsh | ||
| run: | | ||
| echo "${{ runner.temp }}/ninja-${{ inputs.version }}-${{ runner.arch }}" >> $env:GITHUB_PATH |
Oops, something went wrong.
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.gitmodules has wrong branch names after this
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, pushed 0c5aaf3 to fix that
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for keeping an eye on me :)
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's OK. But, why are we poking the old release branch? @slouken : A new release should be made from the SDL2 branch, as should be the case for all other satellite libs.
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because SDL_image will be a point release, not a minor version bump.
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand: Shouldn't a point release be 2.10.0 instead of 2.8.3? Like you agreed for SDL_ttf?
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
major release: 1.0.0 -> 2.0.0, backwards incompatible
minor release: 1.0.0 -> 1.1.0, backwards compatible, adds APIs
point release: 1.0.0 -> 1.0.1, backwards compatible, no added APIs, bug fixes only
f960613There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ookkay - don't like it much but whatever
I cherry-picked a few commits from SDL2 branch in here, so make sure to update your local copies