Merge pull request nextcloud#1966 from nextcloud/repo-sync/android-co…

…nfig/main 🔄 synced file(s) with nextcloud/android-config
ScottieKim · Jan 21, 2024 · b0248e6 · b0248e6
2 parents 77f7871 + 551fccc
commit b0248e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -24,14 +24,18 @@ jobs:
                 run: |
                     if [ -z "$GITHUB_HEAD_REF" ]; then
                         # push
-                        echo "branch=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
-                        echo "pr=$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT"
-                        echo "repo=${{ github.repository }}" >> "$GITHUB_OUTPUT"
+                        {
+                            echo "branch=$GITHUB_REF_NAME"
+                            echo "pr=$GITHUB_RUN_ID"
+                            echo "repo=${{ github.repository }}"
+                        } >> "$GITHUB_OUTPUT"
                     else
                         # pull request
-                        echo "branch=$GITHUB_HEAD_REF" >> "$GITHUB_OUTPUT"
-                        echo "pr=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
-                        echo "repo=${{ github.event.pull_request.head.repo.full_name }}" >> "$GITHUB_OUTPUT"
+                        {
+                            echo "branch=$GITHUB_HEAD_REF"
+                            echo "pr=${{ github.event.pull_request.number }}"
+                            echo "repo=${{ github.event.pull_request.head.repo.full_name }}"
+                        } >> "$GITHUB_OUTPUT"
                     fi
             -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
                 with:
@@ -49,6 +53,6 @@ jobs:
                 env:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: |
-                    mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
-                    scripts/analysis/analysis-wrapper.sh ${{ steps.get-vars.outputs.branch }} ${{ secrets.LOG_USERNAME }} ${{ secrets.LOG_PASSWORD }} $GITHUB_RUN_NUMBER ${{ steps.get-vars.outputs.pr }}
+                    mkdir -p "$HOME/.gradle"
+                    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
+                    scripts/analysis/analysis-wrapper.sh ${{ steps.get-vars.outputs.branch }} ${{ secrets.LOG_USERNAME }} ${{ secrets.LOG_PASSWORD }} "$GITHUB_RUN_NUMBER" ${{ steps.get-vars.outputs.pr }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -46,4 +46,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug --no-configuration-cache
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -37,6 +37,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -26,3 +26,4 @@ jobs:
             Please take a look again and update the issue with new details,
             otherwise the issue will be automatically closed in 2 weeks. Thank you!
           exempt-all-pr-milestones: true
+          labels-to-remove-when-unstale: 'needs info'