From d78321e777fa0248d65f898da5efc0df557b724c Mon Sep 17 00:00:00 2001 From: Michel Hartmann Date: Tue, 21 Jan 2025 17:54:53 +0100 Subject: [PATCH] Backport build configuration from main branch --- .github/dependabot.yml | 15 +++++++++++++++ .github/workflows/publish-release.yml | 10 +++++----- .github/workflows/publish-samples.yml | 10 +++++----- .github/workflows/publish-snapshot.yml | 14 ++++++++++---- .github/workflows/pull-request.yml | 6 +++--- build.gradle | 6 +++--- 6 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a989112 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 31844a6..feb8ae6 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out sources... - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 @@ -38,12 +38,12 @@ jobs: echo "{ \"buildTime\": \"${NOW}\", \"version\": \"${VERSION}\", \"jdfVersion\": \"${JDF_VERSION}\" }" > version.json - name: 'Authenticate to Google Cloud' - uses: 'google-github-actions/auth@v1' + uses: 'google-github-actions/auth@v2' with: credentials_json: '${{ secrets.GCP_SA_KEY }}' - name: Setup GCloud CLI - uses: google-github-actions/setup-gcloud@v1 + uses: google-github-actions/setup-gcloud@v2 with: project_id: ${{ inputs.GCP_PROJECT_ID }} @@ -65,7 +65,7 @@ jobs: run: gsutil cp ./*.tar.gz gs://schema.cip4.org/ - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: xsd-artifact path: xjdf.xsd diff --git a/.github/workflows/publish-samples.yml b/.github/workflows/publish-samples.yml index ac11696..c1db127 100644 --- a/.github/workflows/publish-samples.yml +++ b/.github/workflows/publish-samples.yml @@ -10,31 +10,31 @@ jobs: steps: - name: Get GitHub Access Token id: access_token - uses: tibdex/github-app-token@v1 + uses: tibdex/github-app-token@v2 with: app_id: ${{ secrets.CIP4_GITHUB_ACTIONS_APP_ID }} private_key: ${{ secrets.CIP4_GITHUB_ACTIONS_APP_KEY }} - name: Check out 'XJDF Schema'... - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: 'schema' - name: Check out 'JDF Specificaion'... - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'cip4/JDF-Specification' token: ${{ steps.access_token.outputs.token }} path: 'spec' - name: Check out 'Sample Builder'... - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'cip4/cip4-sample-builder' token: ${{ steps.access_token.outputs.token }} path: 'cip4-sample-builder' - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 4aff8be..5b43107 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out sources... - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 @@ -38,12 +38,12 @@ jobs: echo "{ \"buildTime\": \"${NOW}\", \"version\": \"${VERSION}\", \"specVersion\": \"${SPEC_VERSION}\" }" > version.json - name: 'Authenticate to Google Cloud' - uses: 'google-github-actions/auth@v1' + uses: 'google-github-actions/auth@v2' with: credentials_json: '${{ secrets.GCP_SA_KEY }}' - name: Setup GCloud CLI - uses: google-github-actions/setup-gcloud@v1 + uses: google-github-actions/setup-gcloud@v2 with: project_id: ${{ inputs.GCP_PROJECT_ID }} @@ -64,6 +64,12 @@ jobs: - name: Copy tar.gz Archive to GCloud Bucket run: gsutil cp ./*.tar.gz gs://schema.cip4.org/ + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: xsd-artifact + path: xjdf.xsd + - name: Invalidate CDN Cache run: | gcloud compute url-maps invalidate-cdn-cache cip4-public-balancer --path "/jdfschema_2_x/*" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 90cf599..8403839 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,19 +10,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out 'XJDF Schema'... - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: 'schema' - name: Check out 'Sample Builder'... - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'cip4/cip4-sample-builder' token: ${{ steps.access_token.outputs.token }} path: 'cip4-sample-builder' - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 diff --git a/build.gradle b/build.gradle index b42b83f..447ad03 100644 --- a/build.gradle +++ b/build.gradle @@ -33,14 +33,14 @@ dependencies { implementation localGroovy() testImplementation 'org.glassfish.jaxb:jaxb-runtime:4.0.2' - testImplementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1' + testImplementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' testImplementation 'org.cip4.lib.xjdf:xJdfLib:latest.integration' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.3.1' - testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.4' - testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.4' } test {