Skip to content

Commit

Permalink
[ci] More CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Nov 8, 2024
1 parent a11887a commit 84e8c59
Show file tree
Hide file tree
Showing 14 changed files with 65 additions and 12 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/bsd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: BSDs
on: push
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build_bsd:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/builds.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Linux distro build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
fedora:
name: Fedora (latest)
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/continuous.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Continuous build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
tarball:
name: Tarball
name: Tarball
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down Expand Up @@ -44,7 +48,7 @@ jobs:
staging/*.*
appimage:
name: AppImage
name: AppImage
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down Expand Up @@ -154,7 +158,7 @@ jobs:


win32:
name: Windows
name: Windows
runs-on: windows-latest
steps:
- name: Checkout code
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/debian-builds.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Debian build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
debian:
name: Debian
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Documentation build

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/embedded.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Embedded build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
# rpi:
# name: RaspberryPi
Expand Down Expand Up @@ -172,7 +176,7 @@ jobs:
# run: |
# sudo apt-get -y -qq install crossbuild-essential-armhf cmake gettext file ninja-build libc6-armhf-cross qt6-base-dev libqt6serialport6-dev libqt6websockets6-dev libqt6shadertools6-dev qt6-scxml-dev libpcre2-16-0 qt6-declarative-dev
# sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /usr/lib/ld-linux-armhf.so.3
#
#
# - name: Use host Qt tools
# shell: bash
# run: |
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Flatpak
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
flatpak:
name: "Flatpak"
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/mac-builds.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
name: macOS build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
brew:
# Last X86 macos version supported by GH Actions
name: macOS (Release, Brew, Intel)
runs-on: macos-13

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -28,7 +32,7 @@ jobs:
brew-m1:
name: macOS (Release, Brew, AppleSilicon)
runs-on: macos-15

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -50,7 +54,7 @@ jobs:
brew-m1-dev:
name: macOS (Dev, Brew, AppleSilicon)
runs-on: macos-15

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -93,7 +97,7 @@ jobs:
with:
p12-file-base64: ${{ secrets.MAC_CERT_B64 }}
p12-password: ${{ secrets.MAC_CERT_PASSWORD }}

- run: |
source ci/osx-package.build.sh
env:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/nix-builds.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Nix build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
nix:
name: Nix
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/templates.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Template check
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
init_template:
name: Template generation
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ubuntu-builds.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Ubuntu build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
ubuntu:
name: Ubuntu
name: Ubuntu
runs-on: ubuntu-latest

strategy:
Expand All @@ -19,7 +23,7 @@ jobs:

container:
image: ubuntu:${{ matrix.distro }}

steps:
- name: Install git
run: |
Expand Down Expand Up @@ -49,7 +53,7 @@ jobs:
- name: Upload build
uses: actions/upload-artifact@v4
if: matrix.deploy
if: matrix.deploy
with:
name: ${{ matrix.distro }}-amd64
path: |
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/wasm.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: WASM
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
wasm:
name: WebAssembly
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/win-builds.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Windows build
on: [push,pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
winstore:
name: Windows (store)
Expand Down
1 change: 1 addition & 0 deletions ci/wasm.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ source /opt/ossia-sdk-wasm/emsdk/emsdk_env.sh
-DKFR_ARCH=sse41 \
-DOSSIA_PCH=0 \
-DSCORE_PCH=0 \
-DCMAKE_CXX_SCAN_FOR_MODULES=0 \
-DOSSIA_SDK=/opt/ossia-sdk-wasm/ \
-DCMAKE_C_FLAGS='-pthread -O3 -ffast-math -msimd128 -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 ' \
-DCMAKE_CXX_FLAGS='-DBOOST_ASIO_DISABLE_EPOLL=1 -pthread -O3 -ffast-math -msimd128 -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 ' \
Expand Down

0 comments on commit 84e8c59

Please sign in to comment.