From 8e49f955187b3f5b8e765238915d9ab86058c0d2 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 08:24:29 -0400 Subject: [PATCH 1/6] Try to factor workflow components a bit - step one --- .github/workflows/build-pr.yml | 14 ++------------ .github/workflows/prepare-for-juce.yml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/prepare-for-juce.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7dcf46a0..158a58ee 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -25,18 +25,8 @@ jobs: with: submodules: recursive - - name: Select Xcode Version - if: runner.os == 'macOS' - run: sudo xcode-select -switch /Applications/Xcode_15.1.app - - - - name: Install Linux Deps; pick GCC12 - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + - name: Prepare for JUCE + uses: ./.github/workflows/prepare-for-juce.yml - name: Build pull request version if: github.event_name == 'pull_request' diff --git a/.github/workflows/prepare-for-juce.yml b/.github/workflows/prepare-for-juce.yml new file mode 100644 index 00000000..323cfe7d --- /dev/null +++ b/.github/workflows/prepare-for-juce.yml @@ -0,0 +1,18 @@ +on: + workflow_call: + +jobs: + prepare_system: + steps: + - name: Select Xcode Version + if: runner.os == 'macOS' + run: sudo xcode-select -switch /Applications/Xcode_15.1.app + + - name: Install Linux Deps; pick GCC12 + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + From 78023add96c7945ee8b3a5d843889cf8e36b219e Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 08:29:46 -0400 Subject: [PATCH 2/6] test --- .github/workflows/build-pr.yml | 2 +- .github/workflows/prepare-for-juce.yml | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 .github/workflows/prepare-for-juce.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 158a58ee..3a5757a6 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -26,7 +26,7 @@ jobs: submodules: recursive - name: Prepare for JUCE - uses: ./.github/workflows/prepare-for-juce.yml + uses: surge-synthesizer/sst-githubactions/.github/workflows/prepare-for-juce.yml@main - name: Build pull request version if: github.event_name == 'pull_request' diff --git a/.github/workflows/prepare-for-juce.yml b/.github/workflows/prepare-for-juce.yml deleted file mode 100644 index 323cfe7d..00000000 --- a/.github/workflows/prepare-for-juce.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: - workflow_call: - -jobs: - prepare_system: - steps: - - name: Select Xcode Version - if: runner.os == 'macOS' - run: sudo xcode-select -switch /Applications/Xcode_15.1.app - - - name: Install Linux Deps; pick GCC12 - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 - From 3793793ade5fad4ac6757227f7493967551f5c36 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 12:53:34 -0400 Subject: [PATCH 3/6] composite --- .github/workflows/build-pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 3a5757a6..81648a3b 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -26,7 +26,9 @@ jobs: submodules: recursive - name: Prepare for JUCE - uses: surge-synthesizer/sst-githubactions/.github/workflows/prepare-for-juce.yml@main + uses: surge-synthesizer/sst-githubactions/prepare-for-juce.yml@main + with: + os: ${{ runner.os }} - name: Build pull request version if: github.event_name == 'pull_request' From 9c286a6ed2c9ac79bc3cb5059a07372f58c3f71b Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 12:54:11 -0400 Subject: [PATCH 4/6] close --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 81648a3b..49ff7d8e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -26,7 +26,7 @@ jobs: submodules: recursive - name: Prepare for JUCE - uses: surge-synthesizer/sst-githubactions/prepare-for-juce.yml@main + uses: surge-synthesizer/sst-githubactions/prepare-for-juce@main with: os: ${{ runner.os }} From 41ee2cbbc596e7dd5985462c3995c4aba95c04f5 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 13:09:47 -0400 Subject: [PATCH 5/6] Clang --- .github/workflows/build-pr.yml | 8 -------- .github/workflows/code-checks.yml | 13 ++++++------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 49ff7d8e..eb46d260 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -2,9 +2,6 @@ name: Build Pull Request on: pull_request: -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - defaults: run: shell: bash @@ -31,11 +28,6 @@ jobs: os: ${{ runner.os }} - name: Build pull request version - if: github.event_name == 'pull_request' run: | cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Debug cmake --build ./build --config Debug --target monique-staged --parallel 3 - - - name: Show Build Directory - run: | - ls -l ./build diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index b0f055f2..10a7ff88 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -6,13 +6,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - path: - - 'src' - # - 'include' + path: [ 'src'] steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 + - name: Run clang-format style check - uses: jidicula/clang-format-action@v4.11.0 + uses: surge-synthesizer/sst-githubactions/clang-format-check@main with: - clang-format-version: '17' - check-path: ${{ matrix.path }} \ No newline at end of file + path: ${{ matrix.path }} \ No newline at end of file From 96d414914f5c4c1effe56d7b7a795798003d9da1 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 27 Jul 2024 13:13:45 -0400 Subject: [PATCH 6/6] Wahey - here we go --- .github/workflows/build-release.yml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 48e515e7..6e2b7c02 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -30,23 +30,17 @@ jobs: with: submodules: recursive - - name: Select Xcode Version - if: runner.os == 'macOS' - run: sudo xcode-select -switch /Applications/Xcode_15.1.app - - uses: apple-actions/import-codesign-certs@v3 if: runner.os == 'macOS' with: p12-file-base64: ${{ secrets.MAC_CERTS_P12 }} p12-password: ${{ secrets.CERT_PWD }} - - name: Install Linux Deps; pick GCC9 - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + - name: Prepare for JUCE + uses: surge-synthesizer/sst-githubactions/prepare-for-juce@main + with: + os: ${{ runner.os }} + - name: Build release version run: | @@ -61,12 +55,7 @@ jobs: cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" cmake --build ./build --config Release --target monique-installer --parallel 3 - - name: Show Build Directory - run: | - ls -l ./build - - name: Show Installer Directory - if: github.event_name != 'pull_request' run: | ls -l ./build/installer @@ -80,10 +69,10 @@ jobs: uses: actions/upload-artifact@v4 with: path: build/installer - name: Nightly-${{ matrix.os }} + name: build-${{ matrix.os }} publish-monique-nightly: - name: Publish Monique + name: Publish Monique Nightly # only create a release if a tag was created that is called e.g. v1.2.3 # see also https://vcvrack.com/manual/Manifest#version if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'surge-synthesizer' }}