diff --git a/.github/actions/build-macos-x86_64/action.yml b/.github/actions/build-macos-x86_64/action.yml index 70647c55..c4070bbc 100644 --- a/.github/actions/build-macos-x86_64/action.yml +++ b/.github/actions/build-macos-x86_64/action.yml @@ -23,6 +23,10 @@ inputs: runs: using: "composite" steps: + - name: Derive the WebRTC cache branch from the pom + run: echo "WEBRTC_CACHE_BRANCH=$(sed -n 's|.*branch-heads/\([^<]*\).*|\1|p' webrtc-jni/pom.xml)" >> "$GITHUB_ENV" + shell: bash + - name: Set up WebRTC cache uses: actions/cache@v4 with: @@ -56,7 +60,7 @@ runs: shell: bash - name: Deploy - if: ${{ github.event_name != 'pull_request' }} + if: ${{ github.event_name != 'pull_request' && github.repository == 'devopvoid/webrtc-java' }} env: MAVEN_USERNAME: ${{ inputs.maven-username }} MAVEN_TOKEN: ${{ inputs.maven-password }} diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index ac9969b1..69c84a27 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -23,6 +23,10 @@ inputs: runs: using: "composite" steps: + - name: Derive the WebRTC cache branch from the pom + run: echo "WEBRTC_CACHE_BRANCH=$(sed -n 's|.*branch-heads/\([^<]*\).*|\1|p' webrtc-jni/pom.xml)" >> "$GITHUB_ENV" + shell: bash + - name: Set up WebRTC cache uses: actions/cache@v4 with: @@ -63,7 +67,7 @@ runs: shell: bash - name: Deploy - if: ${{ github.event_name != 'pull_request' }} + if: ${{ github.event_name != 'pull_request' && github.repository == 'devopvoid/webrtc-java' }} env: MAVEN_USERNAME: ${{ inputs.maven-username }} MAVEN_TOKEN: ${{ inputs.maven-password }} diff --git a/.github/actions/release-macos-x86_64/action.yml b/.github/actions/release-macos-x86_64/action.yml index f9f8650f..49d7c0e3 100644 --- a/.github/actions/release-macos-x86_64/action.yml +++ b/.github/actions/release-macos-x86_64/action.yml @@ -31,6 +31,10 @@ inputs: runs: using: "composite" steps: + - name: Derive the WebRTC cache branch from the pom + run: echo "WEBRTC_CACHE_BRANCH=$(sed -n 's|.*branch-heads/\([^<]*\).*|\1|p' webrtc-jni/pom.xml)" >> "$GITHUB_ENV" + shell: bash + - name: Set up WebRTC cache uses: actions/cache@v4 with: diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index 357decc4..323ae602 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -31,6 +31,10 @@ inputs: runs: using: "composite" steps: + - name: Derive the WebRTC cache branch from the pom + run: echo "WEBRTC_CACHE_BRANCH=$(sed -n 's|.*branch-heads/\([^<]*\).*|\1|p' webrtc-jni/pom.xml)" >> "$GITHUB_ENV" + shell: bash + - name: Set up WebRTC cache uses: actions/cache@v4 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8be33478..9e13440d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,6 @@ on: workflow_dispatch: env: - WEBRTC_CACHE_BRANCH: 7339 WEBRTC_CHECKOUT_FOLDER: webrtc WEBRTC_INSTALL_FOLDER: webrtc/build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc11c186..3a1416dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,6 @@ on: default: "X.Y.Z-SNAPSHOT" env: - WEBRTC_CACHE_BRANCH: 7339 WEBRTC_CHECKOUT_FOLDER: webrtc WEBRTC_INSTALL_FOLDER: webrtc/build