From 7f1c1f44fe9b259d109e056c98d4738bd88e7c38 Mon Sep 17 00:00:00 2001 From: "Jesse L. Zamora" Date: Mon, 23 Dec 2024 21:29:23 -0500 Subject: [PATCH] Restore trigger on release --- .github/actions/build-for-distribution/action.yml | 1 - .github/workflows/build-swift-release.yml | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/actions/build-for-distribution/action.yml b/.github/actions/build-for-distribution/action.yml index 9e21f70..13d1c0e 100644 --- a/.github/actions/build-for-distribution/action.yml +++ b/.github/actions/build-for-distribution/action.yml @@ -27,7 +27,6 @@ runs: name: Build Swift + SDK using Sysroot with: swift-tag: ${{ inputs.swift-tag }} - swift-workspace-cache: ${{ inputs.swift-workspace-cache }} sysroot-name: sysroot-${{ inputs.distribution }}-armv7 distribution: ${{ inputs.distribution }} builder-tag: ${{ inputs.builder-tag }} diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml index 73ce512..bc791ce 100644 --- a/.github/workflows/build-swift-release.yml +++ b/.github/workflows/build-swift-release.yml @@ -1,16 +1,12 @@ name: Build Swift Release on: - push: - branches: [ "feature/**" ] release: types: [published] env: - SWIFT_VERSION: 6.0.1 - SWIFT_TAG: swift-6.0.1-RELEASE - #SWIFT_VERSION: ${{ github.event.release.tag_name }} - #SWIFT_TAG: swift-${{ github.event.release.tag_name }}-RELEASE + SWIFT_VERSION: ${{ github.event.release.tag_name }} + SWIFT_TAG: swift-${{ github.event.release.tag_name }}-RELEASE SWIFT_WORKSPACE_CACHE: swift-workspace jobs: @@ -20,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/checkout-swift - name: "Restore or Checkout: ${{ env.SWIFT_TAG }}" + name: "Restore or Checkout ${{ env.SWIFT_VERSION }}" with: swift-tag: ${{ env.SWIFT_TAG }} swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }} @@ -46,7 +42,7 @@ jobs: source ./swift-builder/swift-builder-common ./swift-builder/build-container.sh - uses: ./.github/actions/build-for-distribution - name: "Build & Publish Swift: ${{ env.SWIFT_VERSION }}" + name: "Build & Publish Swift ${{ env.SWIFT_VERSION }}" with: swift-tag: ${{ env.SWIFT_TAG }} swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }}