-
Notifications
You must be signed in to change notification settings - Fork 260
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7892 from lpalashevski/dependabot-aggregate
Dependabot aggregate updates, October 2023.
- Loading branch information
Showing
10 changed files
with
63 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| if: startsWith(github.repository,'odpi/') | ||
| steps: | ||
| - uses: actions/checkout@v3.5.3 | ||
| - uses: actions/checkout@v4.1.0 | ||
| - name: Link Checker | ||
| uses: lycheeverse/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ jobs: | |
| name: "Merge v4" | ||
| if: startsWith(github.repository,'odpi/') | ||
| steps: | ||
| - uses: actions/checkout@v3.5.3 | ||
| - uses: actions/checkout@v4.1.0 | ||
| name: Checkout source | ||
| - uses: gradle/wrapper-validation-action@v1 | ||
| - name: Set up JDK | ||
|
|
@@ -65,22 +65,22 @@ jobs: | |
| branch: gh-pages | ||
| folder: build/docs/javadoc | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v2 | ||
| uses: docker/setup-buildx-action@v3 | ||
| - name: Login to container registry (Quay.io) | ||
| uses: docker/login-action@v2 | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: quay.io | ||
| username: ${{ secrets.QUAY_IO_USERNAME }} | ||
| password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }} | ||
| - name: Login to container registry (Docker Hub) | ||
| uses: docker/login-action@v2 | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| username: ${{ secrets.DOCKER_HUB_USERNAME }} | ||
| password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | ||
| # QEMU is needed for ARM64 build for egeria-configure | ||
| # egeria-configure needs to install utilities | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v2 | ||
| uses: docker/setup-qemu-action@v3 | ||
| - name: Set Release version env variable | ||
| run: | | ||
| echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV | ||
|
|
@@ -91,15 +91,15 @@ jobs: | |
| cp -r open-metadata-distribution/open-metadata-assemblies/build/unpacked/egeria-${{ env.VERSION }}-distribution.tar.gz/. open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly | ||
| - name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!) | ||
| if: ${{ github.ref == 'refs/heads/main'}} | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:latest | ||
| context: ./open-metadata-resources/open-metadata-deployment/docker/egeria | ||
| platforms: linux/amd64,linux/arm64 | ||
| - name: Build and push(egeria) to quay.io and docker.io (no tag latest) | ||
| if: ${{ github.ref != 'refs/heads/main'}} | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:${{ env.VERSION }} | ||
|
|
@@ -108,7 +108,7 @@ jobs: | |
| # Publish container images(egeria-configure) to quay.io and docker.io | ||
| - name: Build and push(egeria-configure) to quay.io and docker.io (tag latest) | ||
| if: ${{ github.ref == 'refs/heads/main'}} | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:latest, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:latest | ||
|
|
@@ -118,27 +118,27 @@ jobs: | |
| # Publish container images(egeria-configure) to quay.io and docker.io | ||
| - name: Build and push(egeria-configure) to quay.io and docker.io (no tag latest) | ||
| if: ${{ github.ref != 'refs/heads/main'}} | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:${{ env.VERSION }} | ||
| context: ./open-metadata-resources/open-metadata-deployment/docker/configure | ||
| platforms: linux/amd64,linux/arm64 | ||
| # -- | ||
| - name: Upload Log of any dependency failures | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Dependency Analysis Report (on failure) | ||
| path: build/reports/dependency-analysis/build-health-report.txt | ||
| if-no-files-found: ignore | ||
| # Mostly for verification - not published to the release itself for now | ||
| - name: Upload assemblies | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Assemblies | ||
| path: open-metadata-distribution/open-metadata-assemblies/build/distributions/*.gz | ||
| - name: Upload Test coverage report | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Jacoco Coverage Report | ||
| path: build/reports/jacoco/codeCoverageReport | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ jobs: | |
| name: "Verify PR v4" | ||
| if: startsWith(github.repository,'odpi/') | ||
| steps: | ||
| - uses: actions/checkout@v3.5.3 | ||
| - uses: actions/checkout@v4.1.0 | ||
| - uses: gradle/wrapper-validation-action@v1 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v3 | ||
|
|
@@ -32,12 +32,12 @@ jobs: | |
| build | ||
| --scan | ||
| - name: Upload Test coverage report | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Jacoco Coverage Report | ||
| path: build/reports/jacoco/codeCoverageReport | ||
| - name: Upload Log of any dependency failures | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Dependency Analysis Report (on failure) | ||
| path: build/reports/dependency-analysis/build-health-report.txt | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,20 +24,20 @@ jobs: | |
| name: "Release" | ||
| if: startsWith(github.repository,'odpi/') | ||
| steps: | ||
| - uses: actions/checkout@v3.5.3 | ||
| - uses: actions/checkout@v4.1.0 | ||
| name: Checkout source | ||
| - uses: gradle/wrapper-validation-action@v1 | ||
| # Prep for docker builds | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v2 | ||
| uses: docker/setup-buildx-action@v3 | ||
| - name: Login to container registry (Quay.io) | ||
| uses: docker/login-action@v2 | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: quay.io | ||
| username: ${{ secrets.QUAY_IO_USERNAME }} | ||
| password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }} | ||
| - name: Login to container registry (docker.io) | ||
| uses: docker/login-action@v2 | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| username: ${{ secrets.DOCKER_HUB_USERNAME }} | ||
| password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | ||
|
|
@@ -62,7 +62,7 @@ jobs: | |
| # QEMU is needed for ARM64 build for egeria-configure | ||
| # egeria-configure needs to install utilities | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v2 | ||
| uses: docker/setup-qemu-action@v3 | ||
| - name: Set Release version env variable | ||
| run: | | ||
| echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV | ||
|
|
@@ -72,23 +72,23 @@ jobs: | |
| mkdir -p ./open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly | ||
| cp -r open-metadata-distribution/open-metadata-assemblies/build/unpacked/egeria-${{ env.VERSION }}-distribution.tar.gz/. open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly | ||
| - name: Build and push(egeria) to quay.io and docker.io | ||
| uses: docker/build-push-action@v4 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:stable, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:stable | ||
| context: ./open-metadata-resources/open-metadata-deployment/docker/egeria | ||
| platforms: linux/amd64,linux/arm64 | ||
| # Publish container images(egeria-configure) to quay.io and docker.io | ||
| - name: Build and push(egeria-configure) to quay.io and docker.io | ||
| uses: docker/build-push-action@v4 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| push: true | ||
| tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:stable, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:stable | ||
| context: ./open-metadata-resources/open-metadata-deployment/docker/configure | ||
| platforms: linux/amd64,linux/arm64 | ||
| # Mostly for verification - not published to the release itself for now | ||
| - name: Upload assemblies | ||
| uses: actions/[email protected].2 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: Assemblies | ||
| path: open-metadata-distribution/open-metadata-assemblies/build/distributions/*.gz | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: "Checkout code" | ||
| uses: actions/checkout@v3.5.3 # tag=v3.0.0 | ||
| uses: actions/checkout@v4.1.0 # tag=v3.0.0 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
|
|
@@ -54,14 +54,14 @@ jobs: | |
| # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF | ||
| # format to the repository Actions tab. | ||
| - name: "Upload artifact" | ||
| uses: actions/[email protected].2 # tag=v3.0.0 | ||
| uses: actions/[email protected].3 # tag=v3.0.0 | ||
| with: | ||
| name: SARIF file | ||
| path: results.sarif | ||
| retention-days: 5 | ||
|
|
||
| # Upload the results to GitHub's code scanning dashboard. | ||
| - name: "Upload to code-scanning" | ||
| uses: github/codeql-action/upload-sarif@v2.20.1 # tag=v1.0.26 | ||
| uses: github/codeql-action/upload-sarif@v2.21.0 # tag=v1.0.26 | ||
| with: | ||
| sarif_file: results.sarif | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
open-metadata-resources/open-metadata-deployment/docker/configure/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters