Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update all non-major dependencies #56

Merged
merged 1 commit into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dockerfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Docker meta
id: meta
Expand All @@ -56,7 +56,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Vulnerability check
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
image-ref: "${{ inputs.image }}:${{ inputs.tag }}"
create-test-report: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gradle-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
ref: ${{ inputs.checkout-ref }}
submodules: ${{ inputs.submodules }}
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
run: ./gradlew ${{ inputs.build-tasks }}

- name: Upload Gradle test reports
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: ${{ !inputs.skip-build && always() }}
with:
name: Gradle test reports
Expand All @@ -197,7 +197,7 @@ jobs:

- name: Vulnerability scan
if: ${{ !inputs.skip-scan }}
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
junit-test-output: "${{ inputs.multi-module && 'trivy-gha-scan/build/test-results/trivy.xml' || 'build/test-results/trivy.xml' }}" # added to unit test report
report-retention-days: 30
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
- name: Upload artifact
if: ${{ always() && inputs.upload-artifact-path != '' }}
continue-on-error: true
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: ${{ inputs.upload-artifact-name }}
path: ${{ inputs.upload-artifact-path }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/gradle-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
release-version: ${{ steps.gradle-release.outputs.release-version }}

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
ref: ${{ inputs.checkout-ref }}
submodules: ${{ inputs.submodules }}
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
run: ./gradlew ${{ inputs.build-tasks }}

- name: Upload Gradle test reports
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: ${{ !inputs.skip-build && always() }}
with:
name: Gradle test reports
Expand Down Expand Up @@ -217,15 +217,15 @@ jobs:

- name: Vulnerability scan
if: ${{ !inputs.skip-scan }}
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
image-ref: 'docker.io/${{ inputs.image-tag }}'
junit-test-output: "${{ inputs.multi-module && 'trivy-gha-scan/build/test-results/trivy.xml' || 'build/test-results/trivy.xml' }}" # added to unit test report
report-retention-days: 30
report-tag: ${{ inputs.image-tag }}

- name: Vulnerability scan (Image 2)
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
if: ${{ !inputs.skip-scan && inputs.image-tag-2 != '' }}
with:
image-ref: 'docker.io/${{ inputs.image-tag-2 }}'
Expand All @@ -234,7 +234,7 @@ jobs:
report-tag: ${{ inputs.image-tag-2 }}

- name: Vulnerability scan (Image 3)
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
if: ${{ !inputs.skip-scan && inputs.image-tag-3 != '' }}
with:
image-ref: 'docker.io/${{ inputs.image-tag-3 }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/play-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
with:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
run: mkdir -p ${{ inputs.junit-test-folder }}

- name: Vulnerability scan
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
image-ref: 'docker.io/${{ inputs.image-tag }}'
junit-test-output: "${{ inputs.junit-test-folder }}/trivy.xml" # added to unit test report
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sbt-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/scan-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
docker pull ${{ matrix.image }}

- name: Vulnerability scan
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
image-ref: ${{ matrix.image }}
create-test-report: ${{ inputs.create-test-report }}
Expand All @@ -100,15 +100,15 @@ jobs:
steps:
- name: Merge SBOM artifacts
if: ${{ inputs.remove-individual-artifacts }}
uses: actions/upload-artifact/merge@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact/merge@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: SBOM (CycloneDX) [all-individual-results]
pattern: SBOM (CycloneDX) * # name used by gha-trivy action
delete-merged: true

- name: Merge HTML report artifacts
if: ${{ inputs.remove-individual-artifacts }}
uses: actions/upload-artifact/merge@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact/merge@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: Vulnerability report (HTML)
pattern: Vulnerability report (HTML)* # name used by gha-trivy action
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:

- name: Upload combined SBOMs
if: ${{ inputs.merge-sboms }}
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: Merged SBOMs (CycloneDX)
path: merged/
Expand All @@ -176,7 +176,7 @@ jobs:
# Scan merged SBOM for an overview, but trivy fails for mixed OS dependencies, so disabled by default
- name: Scan merged SBOM
if: ${{ inputs.merge-sboms && inputs.scan-merged-sbom }}
uses: wetransform/gha-trivy@43245e19f1f3debe1caaeb795f6187f36cfa38de # v2.2.0
uses: wetransform/gha-trivy@e06eaae60c4781e82886b303499cf0ea1a0639a4 # v2.2.1
with:
scan-ref: merged/sbom.json
create-test-report: false
Expand Down
Loading