Skip to content

JCL-350: Better use of GH Environments for CI/CD workflows #457

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.

Sign up for GitHub

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

Merged
acoburn merged 2 commits into from
May 16, 2023
Merged

JCL-350: Better use of GH Environments for CI/CD workflows #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9ef37
JCL-350: Better use of GH Environments for CI/CD workflows
acoburn May 15, 2023
8f7a4e2
Merge branch 'main' into JCL-350-gh-environments
acoburn May 16, 2023
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
12 changes: 8 additions & 4 deletions .github/workflows/cd-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ on:

jobs:
publish:
name: Build and deploy
name: Deploy artifacts
runs-on: ubuntu-latest
environment:
name: "Sonatype"

steps:
- uses: actions/checkout@v3
Expand All @@ -34,7 +36,7 @@ jobs:

- name: Deploy Artifacts
run: mvn deploy -P publish
if: github.actor != 'dependabot[bot]'
if: ${{ github.actor != 'dependabot[bot]' }}
env:
MAVEN_REPO_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MAVEN_REPO_TOKEN: ${{ secrets.SONATYPE_TOKEN }}
Expand All @@ -46,6 +48,9 @@ jobs:
site:
name: Publish version-specific site
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
environment:
name: "Github Pages"

steps:
- uses: actions/checkout@v3
Expand All @@ -70,15 +75,14 @@ jobs:

- name: Publish tagged site to GitHub pages
uses: peaceiris/actions-gh-pages@v3
if: github.actor != 'dependabot[bot]' && startsWith(github.event.ref, 'refs/tags/inrupt-client')
if: ${{ startsWith(github.event.ref, 'refs/tags/inrupt-client') }}
with:
keep_files: true
publish_dir: ./target/staging/
personal_token: ${{ secrets.GITHUB_TOKEN }}

- name: Publish versioned site to GitHub pages
uses: peaceiris/actions-gh-pages@v3
if: github.actor != 'dependabot[bot]'
with:
keep_files: true
publish_dir: ./target/staging/
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,9 @@ jobs:
build:
name: Java environment
runs-on: ubuntu-latest
environment:
name: ${{ matrix.environment-name }}
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
environment-name: ["ESS PodSpaces"]
java: [ 11, 17 ]
experimental: [false]
include:
- environment-name: "ESS DevNext"
java: 11
experimental: true

steps:
- uses: actions/checkout@v3
Expand All @@ -34,15 +25,24 @@ jobs:
- name: Build the code with Maven
run: mvn -B -ntp install -Pci -pl -integration/uma,-integration/openid

- name: Integration tests (${{ matrix.environment-name }})
run: mvn -B -ntp verify -Pci -pl integration/uma,integration/openid
- name: Prod Integration tests
if: ${{ github.actor != 'dependabot[bot]' }}
# for integration tests
run: mvn -B -ntp verify -Pci -pl integration/uma,integration/openid
env:
INRUPT_TEST_WEBID: ${{ secrets.INRUPT_PROD_WEBID }}
INRUPT_TEST_PUBLIC_RESOURCE_PATH: ${{ secrets.INRUPT_PROD_PUBLIC_RESOURCE_PATH }}
INRUPT_TEST_CLIENT_ID: ${{ secrets.INRUPT_PROD_CLIENT_ID }}
INRUPT_TEST_CLIENT_SECRET: ${{ secrets.INRUPT_PROD_CLIENT_SECRET }}

- name: Dev Integration tests
if: ${{ github.actor != 'dependabot[bot]' && matrix.java-version == 11 }}
continue-on-error: true
run: mvn -B -ntp verify -Pci -pl integration/uma,integration/openid
env:
inrupt.test-webid: ${{ secrets.INRUPT_TEST_WEBID }}
inrupt.test.public-resource-path: ${{ secrets.INRUPT_TEST_PUBLIC_RESOURCE_PATH }}
inrupt.test.client-id: ${{ secrets.INRUPT_TEST_CLIENT_ID }}
inrupt.test.client-secret: ${{ secrets.INRUPT_TEST_CLIENT_SECRET }}
INRUPT_TEST_WEBID: ${{ secrets.INRUPT_DEV_WEBID }}
INRUPT_TEST_PUBLIC_RESOURCE_PATH: ${{ secrets.INRUPT_DEV_PUBLIC_RESOURCE_PATH }}
INRUPT_TEST_CLIENT_ID: ${{ secrets.INRUPT_DEV_CLIENT_ID }}
INRUPT_TEST_CLIENT_SECRET: ${{ secrets.INRUPT_DEV_CLIENT_SECRET }}

dependencies:
name: Dependency Check
Expand Down