Skip to content

Commit

Permalink
Backport build configuration from main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
MichelHartmann committed Jan 21, 2025
1 parent 8368058 commit d78321e
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 20 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 5 additions & 5 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

Expand All @@ -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/*"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit d78321e

Please sign in to comment.