Skip to content

Commit 8e7d9ee

Browse files
authored
Merge pull request #27 from killbill/update-workflows
update workflows files
2 parents 7148667 + 8fd7727 commit 8e7d9ee

4 files changed

Lines changed: 23 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77

88
jobs:
99
ci:
10-
uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
10+
uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21
1111
with:
1212
test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]'
1313
secrets:
1414
extra-env: '{ "GOCARDLESS_ACCESS_TOKEN": "${{ secrets.GOCARDLESS_ACCESS_TOKEN }}", "GOCARDLESS_ENVIRONMENT": "${{ secrets.GOCARDLESS_ENVIRONMENT }}"}'
1515

1616
integration_test:
17-
uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
17+
uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21
1818
with:
1919
plugin_name: 'gocardless'
2020
integration_tests_goal: 'test:plugins:gocardless'

.github/workflows/cloudsmith_release.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Compute short sha1
1717
run: echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
1818
- name: Setup git user
@@ -24,14 +24,16 @@ jobs:
2424
git config --global user.name "Kill Bill core team"
2525
git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
2626
- name: Configure Java
27-
uses: actions/setup-java@v1
27+
uses: actions/setup-java@v4
2828
with:
29-
java-version: 8
29+
java-version: 21
30+
distribution: temurin
3031
- name: Configure Sonatype mirror
31-
uses: s4u/maven-settings-action@v2.3.0
32-
# Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
32+
uses: s4u/maven-settings-action@v4.0.0
33+
# Resolve release dependencies from Central and snapshot killbill-oss-parent builds from Sonatype.
3334
with:
34-
mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
35+
sonatypeSnapshots: true
36+
githubServer: false
3537
- name: Update maven version
3638
run: |
3739
plugin_version=$(mvn ${MAVEN_FLAGS} help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d - -f 1)
@@ -40,9 +42,10 @@ jobs:
4042
run: |
4143
mvn ${MAVEN_FLAGS} clean install -DskipTests=true -Dgpg.skip=true -Dcheck.skip-rat=true -Dcheck.skip-spotbugs=true
4244
- name: Configure settings.xml for release
43-
uses: actions/setup-java@v1
45+
uses: actions/setup-java@v4
4446
with:
45-
java-version: 8
47+
java-version: 21
48+
distribution: temurin
4649
server-id: ${{ secrets.CLOUDSMITH_REPO }}
4750
server-username: CLOUDSMITH_USER
4851
server-password: CLOUDSMITH_API_KEY
@@ -57,15 +60,15 @@ jobs:
5760
run: |
5861
GROUP_ID=org.kill-bill.billing.plugin.java
5962
VERSION=$(mvn ${MAVEN_FLAGS} help:evaluate -Dexpression=project.version -q -DforceStdout)
60-
FILE=avatax-plugin-$VERSION.jar
63+
FILE=gocardless-plugin-$VERSION.jar
6164
# Make sure the current pom.xml file isn't uploaded
6265
cp ./target/$FILE /var/tmp/
6366
cd /var/tmp
6467
mvn ${MAVEN_FLAGS} deploy:deploy-file -Dfile=$FILE \
6568
-DrepositoryId=$CLOUDSMITH_REPO \
6669
-Durl=https://maven.cloudsmith.io/killbill/$CLOUDSMITH_REPO \
6770
-DgroupId=$GROUP_ID \
68-
-DartifactId=avatax-plugin \
71+
-DartifactId=gocardless-plugin \
6972
-Dversion=$VERSION \
7073
-Dpackaging=jar \
7174
-DgeneratePom=true \

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ on:
77

88
jobs:
99
analyze:
10-
uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
10+
uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21

.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
steps:
2323
- name: Checkout code
2424
if: github.event.inputs.perform_version == ''
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
- name: Checkout full repository
2727
# Required when performing an existing release.
2828
if: github.event.inputs.perform_version != ''
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: '0'
3232
- name: Setup git user
@@ -38,9 +38,10 @@ jobs:
3838
git config --global user.name "Kill Bill core team"
3939
git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
4040
- name: Configure Java
41-
uses: actions/setup-java@v1
41+
uses: actions/setup-java@v4
4242
with:
43-
java-version: 11
43+
java-version: 21
44+
distribution: temurin
4445
- name: Download Java dependencies
4546
# We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
4647
run: |
@@ -59,9 +60,9 @@ jobs:
5960
# Will be pushed as part of the release process, only if the release is successful
6061
git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
6162
- name: Configure settings.xml for release
62-
uses: actions/setup-java@v3
63+
uses: actions/setup-java@v4
6364
with:
64-
java-version: 11
65+
java-version: 21
6566
distribution: temurin
6667
server-id: central
6768
server-username: MAVEN_USERNAME

0 commit comments

Comments
 (0)