Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 58 additions & 12 deletions .github/workflows/cut-release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🏭 Cut Mod Release
name: Cut Mod Release

on:
workflow_dispatch:
Expand All @@ -12,23 +12,69 @@ on:
- patch
- minor
- major
binary_source:
description: 'Binary Source'
required: true
default: 'build_binaries'
type: choice
options:
- vanilla
- modbase
- build_binaries
jak1:
description: 'Supports Jak 1?'
required: true
default: 'true'
type: boolean
jak2:
description: 'Supports Jak 2?'
required: true
default: 'false'
type: boolean
jak3:
description: 'Supports Jak 3?'
required: true
default: 'false'
type: boolean
jakx:
description: 'Supports Jak X?'
required: true
default: 'false'
type: boolean

permissions:
contents: write

jobs:
cut_release:
name: "Cut Release"
uses: open-goal/mod-bundling-tools/.github/workflows/mod-bundler.yml@v1
prep_vars:
name: "Prep Variables"
runs-on: ubuntu-latest
outputs:
supported_games: ${{ steps.prep-vars.outputs.GAMES }}
tooling_repo: ${{ steps.prep-vars.outputs.REPO }}
steps:
- name: Prep Variables
id: prep-vars
run: |
GAMES=
if [[ ${{ inputs.jak1 }} == "true" ]]; then GAMES+=jak1,; fi
if [[ ${{ inputs.jak2 }} == "true" ]]; then GAMES+=jak2,; fi
if [[ ${{ inputs.jak3 }} == "true" ]]; then GAMES+=jak3,; fi
if [[ ${{ inputs.jakx }} == "true" ]]; then GAMES+=jakx,; fi
GAMES=${GAMES%?}
echo "GAMES=$GAMES" >> $GITHUB_OUTPUT
REPO=OpenGOAL-Mods/OG-Mod-Base
if [[ ${{ inputs.binary_source == 'vanilla' }} ]]; then REPO=open-goal/jak-project; fi
echo "REPO=$REPO" >> $GITHUB_OUTPUT

cut_mod_release:
name: "Cut Mod Release"
needs: prep_vars
uses: ./.github/workflows/mod-release-pipeline.yml
with:
semverBump: ${{ inputs.bump }}
metadataName: "MicroTransactions"
metadataDescription: "Unlock Jak's moveset with orbs!"
metadataSupportedGames: "jak1"
metadataAuthors: "HimHam,barg"
metadataTags: "challenge,gameplay-mod"
metadataWebsiteUrl: "https://github.com/OpenGOAL-Mods/OG-Microtransactions"
toolingRepo: "OpenGOAL-Mods/OG-Mod-Base"
gameAssetsDir: "game/assets"
metadataSupportedGames: ${{ needs.prep_vars.outputs.supported_games }}
buildBinaries: ${{ inputs.binary_source == 'build_binaries'}}
toolingRepo: ${{ needs.prep_vars.outputs.tooling_repo }}
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 10 additions & 0 deletions .github/workflows/linux-build-clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ jobs:
timeout-minutes: 60

steps:
# minimal checkout if we're NOT uploading artifacts
- name: Checkout Repository
if: ${{ ! inputs.uploadArtifacts }}
uses: actions/checkout@v4

# full checkout with tags if we ARE uploading artifacts
- name: Checkout Repository with Tags
if: ${{ inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: |
sudo apt update
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/linux-build-gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/macos-build-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ on:
jobs:
build:
name: ARM
runs-on: macos-12
runs-on: macos-15
timeout-minutes: 120

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up ARM64 environment
run: sudo softwareupdate --install-rosetta --agree-to-license
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: arch -arm64 brew install cmake ninja
run: brew install cmake ninja nasm

- name: Setup sccache
uses: hendrikmuhs/ccache-action@v1.2.14
with:
variant: sccache
key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
restore-keys: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
key: macos-15-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
restore-keys: macos-15-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
max-size: 1000M

- name: CMake Generation
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: opengoal-macos-${{ inputs.cachePrefix }}
name: opengoal-macos-arm-${{ inputs.cachePrefix }}
if-no-files-found: error
path: |
./build/goalc/goalc
Expand Down
43 changes: 40 additions & 3 deletions .github/workflows/macos-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,49 @@ on:
jobs:
build:
name: Intel
runs-on: macos-12
runs-on: macos-13
timeout-minutes: 120

steps:
# minimal checkout if we're NOT uploading artifacts
- name: Checkout Repository
if: ${{ ! inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

# full checkout with tags if we ARE uploading artifacts
- name: Checkout Repository with Tags
if: ${{ inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

# full checkout with tags if we ARE uploading artifacts
- name: Checkout Repository with Tags
if: ${{ inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

# full checkout with tags if we ARE uploading artifacts
- name: Checkout Repository with Tags
if: ${{ inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

# full checkout with tags if we ARE uploading artifacts
- name: Checkout Repository with Tags
if: ${{ inputs.uploadArtifacts }}
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: brew install cmake nasm ninja
Expand All @@ -31,8 +68,8 @@ jobs:
uses: hendrikmuhs/ccache-action@v1.2.14
with:
variant: sccache
key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
restore-keys: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
key: macos-13-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
restore-keys: macos-13-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
max-size: 1000M

- name: CMake Generation
Expand Down
Loading