فهرست منبع

Update some workflows

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 3 سال پیش
والد
کامیت
e74e12c293
2فایلهای تغییر یافته به همراه9 افزوده شده و 26 حذف شده
  1. 1 25
      .github/workflows/analysis.yml
  2. 8 1
      .github/workflows/qa.yml

+ 1 - 25
.github/workflows/analysis.yml

@@ -1,7 +1,7 @@
 name: "Analysis"
 
 on:
-    pull_request_target:
+    pull_request:
         branches: [ master, stable-* ]
     push:
         branches: [ master, stable-* ]
@@ -10,31 +10,7 @@ jobs:
     analysis:
         runs-on: ubuntu-latest
         steps:
-            -   name: Setup variables
-                id: get-vars
-                run: |
-                    if [ -z "$GITHUB_HEAD_REF" ]; then
-                        # push
-                        echo "::set-output name=branch::$GITHUB_REF_NAME"
-                        echo "::set-output name=pr::$GITHUB_RUN_ID"
-                        echo "::set-output name=repo::${{ github.repository }}"
-                    else
-                        # pull request
-                        echo "::set-output name=branch::$GITHUB_HEAD_REF"
-                        echo "::set-output name=pr::${{ github.event.pull_request.number }}"
-                        echo "::set-output name=repo::${{ github.event.pull_request.head.repo.full_name }}"
-                    fi
-            -   name: Show variables
-                run: |
-                    echo "REPO: ${{ steps.get-vars.outputs.repo }}"
-                    echo "BRANCH: ${{ steps.get-vars.outputs.branch }}"
-                    echo "PR: ${{ steps.get-vars.outputs.pr }}"
-                    echo "RUN NUMBER: $GITHUB_RUN_NUMBER"
             -   uses: actions/checkout@v3
-                with:
-                    token: ${{ secrets.GIT_TOKEN }}
-                    repository: ${{ steps.get-vars.outputs.repo }}
-                    ref: ${{ steps.get-vars.outputs.branch }}
             -   name: Set up JDK 11
                 uses: actions/setup-java@v3
                 with:

+ 8 - 1
.github/workflows/qa.yml

@@ -1,27 +1,34 @@
 name: "QA"
 
 on:
-    pull_request_target:
+    pull_request:
         branches: [ master, stable-* ]
 
 jobs:
     qa:
         runs-on: ubuntu-latest
         steps:
+            -   name: Check if secrets are available
+                run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}"
+                id: check-secrets
             -   uses: actions/checkout@v3
+                if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 with:
                     repository: ${{ github.event.pull_request.head.repo.full_name }}
                     ref: ${{ github.event.pull_request.head.ref }}
             -   name: set up JDK 11
                 uses: actions/setup-java@v3
+                if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 with:
                     distribution: "temurin"
                     java-version: 11
             -   name: Install NDK and cmake
+                if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 run: |
                     source ndk.env
                     /usr/local/lib/android/sdk/tools/bin/sdkmanager "ndk;${NDK_VERSION}" "cmake;${CMAKE_VERSION}"
             -   name: Build QA
+                if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 env:
                     KS_PASS: ${{ secrets.KS_PASS }}
                     KEY_PASS: ${{ secrets.KEY_PASS }}