Skip to content

Commit 977264d

Browse files
committed
Fix build from fork
1 parent d0f62ec commit 977264d

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.github/workflows/build-base-images.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v4
4545

4646
- name: Run Linters
47-
uses: pre-commit/[email protected].0
47+
uses: pre-commit/[email protected].1
4848

4949
- name: Set up QEMU
5050
uses: docker/setup-qemu-action@v3
@@ -64,6 +64,11 @@ jobs:
6464
fi
6565
echo "tag=${{ github.sha }}" >> $GITHUB_OUTPUT
6666
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
67+
if [[ ("${{ github.event_name }}" == "pull_request") ]] ; then
68+
echo "ci_push=never" >> $GITHUB_OUTPUT
69+
else
70+
echo "ci_push=always" >> $GITHUB_OUTPUT
71+
fi
6772
6873
- id: github-repository-name-case-adjusted
6974
name: Prepare repository name in lower case for docker upload.
@@ -84,7 +89,7 @@ jobs:
8489
with:
8590
imageName: ghcr.io/${{ steps.github-repository-name-case-adjusted.outputs.lowercase }}/${{ matrix.image }}
8691
imageTag: ${{ steps.get-tag.outputs.tags }}
87-
push: always
92+
push: ${{ steps.get-tag.outputs.ci_push }}
8893
platform: linux/amd64,linux/arm64
8994
noCache: true
9095
subFolder: ./Dockerfiles/${{ matrix.image }}/

.github/workflows/check-licenses.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
generate-dash: true
4646

4747
- name: Setup Java JDK
48-
uses: actions/setup-java@v3.13.0
48+
uses: actions/setup-java@v4
4949
with:
5050
distribution: 'temurin'
5151
java-version: '17'
@@ -57,7 +57,16 @@ jobs:
5757
GITLAB_TOKEN:
5858
run: |
5959
wget -O dash.jar "https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/1.0.2/org.eclipse.dash.licenses-1.0.2.jar"
60-
java -jar dash.jar -project automotive.velocitas -review -token ${{ secrets.GITLAB_API_TOKEN }} -summary DEPENDENCIES clearlydefined.input 2> output.log
60+
if [[ -n "${{ secrets.GITLAB_API_TOKEN }}" ]]; then
61+
echo -e "Dash token available. Will create tickets when required. \n " >> $GITHUB_STEP_SUMMARY
62+
java -jar dash.jar -project automotive.velocitas -review -token ${{ secrets.GITLAB_API_TOKEN }} -summary DEPENDENCIES clearlydefined.input > dash.out 2>&1 || true
63+
else
64+
echo -e "Dash token not available. Will perform checking only. \n " >> $GITHUB_STEP_SUMMARY
65+
java -jar dash.jar -project automotive.velocitas -summary DEPENDENCIES clearlydefined.input > dash.out 2>&1 || true
66+
fi
67+
echo -e "Dash output: \n\`\`\` " >> $GITHUB_STEP_SUMMARY
68+
cat dash.out >> $GITHUB_STEP_SUMMARY
69+
echo -e "\n\`\`\`"
6170
6271
- name: Upload dash input/output as artifacts
6372
uses: actions/upload-artifact@v4

NOTICE-3RD-PARTY-CONTENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
| Dependency | Version | License |
55
|:-----------|:-------:|--------:|
66
|actions/checkout|v4|MIT License|
7-
|actions/setup-java|v3.13.0|MIT License|
7+
|actions/setup-java|v4|MIT License|
88
|actions/upload-artifact|v4|MIT License|
99
|ASzc/change-string-case-action|v6|ISC License|
1010
|devcontainers/ci|v0.3|MIT License|
@@ -13,4 +13,4 @@
1313
|docker/setup-qemu-action|v3|Apache License 2.0|
1414
|EndBug/add-and-commit|v9|MIT License|
1515
|fountainhead/action-wait-for-check|v1.2.0|MIT License|
16-
|pre-commit/action|v3.0.0|MIT License|
16+
|pre-commit/action|v3.0.1|MIT License|

0 commit comments

Comments
 (0)