From 2f50d2a13f375b1d31ec00304bd08dd94903ed17 Mon Sep 17 00:00:00 2001 From: Jerry Jacobs Date: Mon, 23 Feb 2026 11:45:34 +0100 Subject: [PATCH] github/workflows: Cleanup --- .github/workflows/build-syncthing-macos.yml | 54 +++++++++---------- ...acos-release-dmg-unnotarized-on-demand.yml | 0 .../build-syncthing-macos.yml} | 54 +++++++++---------- 3 files changed, 54 insertions(+), 54 deletions(-) rename .github/workflows/{ => disabled}/build-syncthing-macos-release-dmg-unnotarized-on-demand.yml (100%) rename .github/workflows/{build-syncthing-macos-v2.yml => disabled/build-syncthing-macos.yml} (80%) diff --git a/.github/workflows/build-syncthing-macos.yml b/.github/workflows/build-syncthing-macos.yml index a8a828d..b81eb87 100644 --- a/.github/workflows/build-syncthing-macos.yml +++ b/.github/workflows/build-syncthing-macos.yml @@ -1,9 +1,9 @@ -name: Build Syncthing macOS +name: Build Syncthing macOS v2 on: pull_request: branches: - - develop + - v2 push: # A note on actions and third party code... The actions under actions/ (like @@ -14,32 +14,32 @@ on: # that lead up to code being packaged and signed. jobs: - build-debug: - name: Build debug - if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch) - runs-on: macos-13 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Build debug target - run: make debug - - - name: Prepare debug build for artifact - run: make debug-dist - - - name: Archive artifacts - uses: actions/upload-artifact@v4 - with: - name: syncthing-macos-debug - path: Build/Products/Debug/dist +# build-debug: +# name: Build debug +# if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch) +# runs-on: macos-13 +# steps: +# - uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# +# - name: Build debug target +# run: make debug +# +# - name: Prepare debug build for artifact +# run: make debug-dist +# +# - name: Archive artifacts +# uses: actions/upload-artifact@v4 +# with: +# name: syncthing-macos-debug +# path: Build/Products/Debug/dist build-release: name: Build release - if: github.event_name == 'push' && github.ref == 'refs/heads/release' + if: github.event_name == 'push' && github.ref == 'refs/heads/v2' environment: signing - runs-on: macos-13 + runs-on: macos-15 steps: - uses: actions/checkout@v4 with: @@ -78,12 +78,12 @@ jobs: - name: Archive artifacts uses: actions/upload-artifact@v4 with: - name: syncthing-macos-dmg-release + name: syncthing-macos-v2-dmg-release path: Build/Products/Release/*.dmg notarize: name: Notarize for macOS - if: github.event_name == 'push' && github.ref == 'refs/heads/release' + if: github.event_name == 'push' && github.ref == 'refs/heads/v2' environment: signing needs: - build-release @@ -92,7 +92,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - name: syncthing-macos-dmg-release + name: syncthing-macos-v2-dmg-release - name: Notarize binaries run: | diff --git a/.github/workflows/build-syncthing-macos-release-dmg-unnotarized-on-demand.yml b/.github/workflows/disabled/build-syncthing-macos-release-dmg-unnotarized-on-demand.yml similarity index 100% rename from .github/workflows/build-syncthing-macos-release-dmg-unnotarized-on-demand.yml rename to .github/workflows/disabled/build-syncthing-macos-release-dmg-unnotarized-on-demand.yml diff --git a/.github/workflows/build-syncthing-macos-v2.yml b/.github/workflows/disabled/build-syncthing-macos.yml similarity index 80% rename from .github/workflows/build-syncthing-macos-v2.yml rename to .github/workflows/disabled/build-syncthing-macos.yml index b81eb87..a8a828d 100644 --- a/.github/workflows/build-syncthing-macos-v2.yml +++ b/.github/workflows/disabled/build-syncthing-macos.yml @@ -1,9 +1,9 @@ -name: Build Syncthing macOS v2 +name: Build Syncthing macOS on: pull_request: branches: - - v2 + - develop push: # A note on actions and third party code... The actions under actions/ (like @@ -14,32 +14,32 @@ on: # that lead up to code being packaged and signed. jobs: -# build-debug: -# name: Build debug -# if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch) -# runs-on: macos-13 -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# -# - name: Build debug target -# run: make debug -# -# - name: Prepare debug build for artifact -# run: make debug-dist -# -# - name: Archive artifacts -# uses: actions/upload-artifact@v4 -# with: -# name: syncthing-macos-debug -# path: Build/Products/Debug/dist + build-debug: + name: Build debug + if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch) + runs-on: macos-13 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Build debug target + run: make debug + + - name: Prepare debug build for artifact + run: make debug-dist + + - name: Archive artifacts + uses: actions/upload-artifact@v4 + with: + name: syncthing-macos-debug + path: Build/Products/Debug/dist build-release: name: Build release - if: github.event_name == 'push' && github.ref == 'refs/heads/v2' + if: github.event_name == 'push' && github.ref == 'refs/heads/release' environment: signing - runs-on: macos-15 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: @@ -78,12 +78,12 @@ jobs: - name: Archive artifacts uses: actions/upload-artifact@v4 with: - name: syncthing-macos-v2-dmg-release + name: syncthing-macos-dmg-release path: Build/Products/Release/*.dmg notarize: name: Notarize for macOS - if: github.event_name == 'push' && github.ref == 'refs/heads/v2' + if: github.event_name == 'push' && github.ref == 'refs/heads/release' environment: signing needs: - build-release @@ -92,7 +92,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - name: syncthing-macos-v2-dmg-release + name: syncthing-macos-dmg-release - name: Notarize binaries run: |