Skip to content

Commit

Permalink
Break some more workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
harrisonvanderbyl committed Jan 8, 2024
1 parent 6554ad3 commit d570940
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🐧 Linux Builds
name: 🤖 Android Builds
on:
push:
branches: [ master, github_actions ]
Expand Down
25 changes: 15 additions & 10 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,18 @@ env:
jobs:
linux-editor:
runs-on: "ubuntu-20.04"
name: Ubuntu

name: ${{ matrix.name }}
strategy:
fail-fast: false
matrix:
include:
- name: Editor (target=editor)
cache-name: linux-editor-cache
target: editor

- name: Template (target=template_release)
cache-name: ubuntu-template
target: template_release

steps:
# Clone Godot
Expand Down Expand Up @@ -77,7 +87,7 @@ jobs:

# Upload cache on completion and check it out now
- name: Load .scons_cache directory
id: linux-editor-cache
id: ${{ matrix.cache-name }}
uses: actions/cache@v2
with:
path: ${{github.workspace}}/.scons_cache/
Expand Down Expand Up @@ -112,14 +122,9 @@ jobs:
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
run: |
PATH=${GITHUB_WORKSPACE}/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH
scons
scons target=${{ matrix.target }}
- name: Compilation
env:
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
run: |
PATH=${GITHUB_WORKSPACE}/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH
scons target=template_release

- name: Prepare artifact
run: |
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,16 @@ jobs:
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Load .scons_cache directory
id: mac-editor-cache${{ matrix.name }}
uses: actions/cache@v2
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true
path: ${{github.workspace}}/.scons_cache/
key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
restore-keys: |
${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
${{github.job}}-${{env.GODOT_BASE_BRANCH}}
- name: Setup python and scons
uses: ./.github/actions/godot-deps
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@ jobs:
windows-editor:
# Windows 10 with latest image
runs-on: "windows-latest"
name: win32
name: ${{ matrix.name }}
strategy:
fail-fast: false
matrix:
include:
- name: Editor (target=editor, tests=yes)
cache-name: win-editor-cache
target: editor

- name: Template (target=template_release)
cache-name: win-template
target: template_release

steps:
# Clone Godot
Expand Down Expand Up @@ -47,7 +58,7 @@ jobs:
# Upload cache on completion and check it out now
# Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
- name: Load .scons_cache directory
id: windows-editor-cache
id: ${{ matrix.name }}
#uses: ${{matrix.cache_action}}
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -82,7 +93,8 @@ jobs:
env:
SCONS_CACHE: /.scons_cache/
run: |
scons
scons target=${{ matrix.target }}
# Make build available
- uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ if(env["PLATFORM"] != "win32"):



env_rwkv.Append(CCFLAGS=['-fexceptions'])

# add -march=avx512
print(env["platform"])
if env["platform"] == "linuxbsd":
print("Using linuxbsd")
env_rwkv.Append(CCFLAGS=['-fexceptions'])
# add -O3
env_rwkv.Append(CCFLAGS=['-O3'])
# add -march=avx512
Expand Down

0 comments on commit d570940

Please sign in to comment.