Skip to content

Commit b0248e6

Browse files
Merge pull request #1966 from nextcloud/repo-sync/android-config/main
πŸ”„ synced file(s) with nextcloud/android-config
2 parents 77f7871 + 551fccc commit b0248e6

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

β€Ž.github/workflows/analysis.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ jobs:
2424
run: |
2525
if [ -z "$GITHUB_HEAD_REF" ]; then
2626
# push
27-
echo "branch=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
28-
echo "pr=$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT"
29-
echo "repo=${{ github.repository }}" >> "$GITHUB_OUTPUT"
27+
{
28+
echo "branch=$GITHUB_REF_NAME"
29+
echo "pr=$GITHUB_RUN_ID"
30+
echo "repo=${{ github.repository }}"
31+
} >> "$GITHUB_OUTPUT"
3032
else
3133
# pull request
32-
echo "branch=$GITHUB_HEAD_REF" >> "$GITHUB_OUTPUT"
33-
echo "pr=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
34-
echo "repo=${{ github.event.pull_request.head.repo.full_name }}" >> "$GITHUB_OUTPUT"
34+
{
35+
echo "branch=$GITHUB_HEAD_REF"
36+
echo "pr=${{ github.event.pull_request.number }}"
37+
echo "repo=${{ github.event.pull_request.head.repo.full_name }}"
38+
} >> "$GITHUB_OUTPUT"
3539
fi
3640
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3741
with:
@@ -49,6 +53,6 @@ jobs:
4953
env:
5054
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5155
run: |
52-
mkdir -p $HOME/.gradle
53-
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
54-
scripts/analysis/analysis-wrapper.sh ${{ steps.get-vars.outputs.branch }} ${{ secrets.LOG_USERNAME }} ${{ secrets.LOG_PASSWORD }} $GITHUB_RUN_NUMBER ${{ steps.get-vars.outputs.pr }}
56+
mkdir -p "$HOME/.gradle"
57+
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
58+
scripts/analysis/analysis-wrapper.sh ${{ steps.get-vars.outputs.branch }} ${{ secrets.LOG_USERNAME }} ${{ secrets.LOG_PASSWORD }} "$GITHUB_RUN_NUMBER" ${{ steps.get-vars.outputs.pr }}

β€Ž.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
swap-size-gb: 10
3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
35+
uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
3636
with:
3737
languages: ${{ matrix.language }}
3838
- name: Set up JDK 17
@@ -46,4 +46,4 @@ jobs:
4646
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
4747
./gradlew assembleDebug --no-configuration-cache
4848
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
49+
uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1

β€Ž.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737

3838
# Upload the results to GitHub's code scanning dashboard.
3939
- name: "Upload to code-scanning"
40-
uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
40+
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
4141
with:
4242
sarif_file: results.sarif

β€Ž.github/workflows/stale.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ jobs:
2626
Please take a look again and update the issue with new details,
2727
otherwise the issue will be automatically closed in 2 weeks. Thank you!
2828
exempt-all-pr-milestones: true
29+
labels-to-remove-when-unstale: 'needs info'

0 commit comments

Comments
Β (0)