Skip to content

Commit

Permalink
chore(deps): update swanseauniversitymedical/workflows action to v3 (#29
Browse files Browse the repository at this point in the history 
)

Co-authored-by: dare-renovate[bot] <129118232+dare-renovate[bot]@users.noreply.github.enterprise.com>
Co-authored-by: Joss Whittle <[email protected]>
  • Loading branch information
@dare-renovate @JossWhittle
3 people authored Oct 4, 2023
1 parent 1ec1fe1 commit b7b5671
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 24 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/on-pr-update.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:
- opened
- synchronize

permissions:
# read on both needed for changes detection
pull-requests: read
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -14,7 +19,7 @@ jobs:

slack:
# Open a new PR thread on Slack for this CI run.
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-pr-thread.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-pr-thread.yaml@v3.0.0
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
secrets:
Expand All @@ -23,11 +28,10 @@ jobs:
changes:
# Detect which files have been changed on this PR's full history
needs: slack
uses: SwanseaUniversityMedical/workflows/.github/workflows/changes.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/changes.yaml@v3.0.0
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
github-app-id: ${{ vars.APP_ID }}
filters: |
hive-container:
- './.github/workflows/on-pr-update.yaml'
Expand All @@ -38,29 +42,26 @@ jobs:
secrets:
slack-token: ${{ secrets.SLACK_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}

hive-container:
# Build the container and push it as :pr-42 and :pr-42-fe45b3h
needs:
- slack
- changes
if: fromJSON(needs.changes.outputs.changes).hive-container == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-pr-update-container.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-pr-update-container.yaml@v3.0.0
with:
job-name: hive-container
container-registry: ${{ vars.HARBOR_REGISTRY }}
container-registry-user: ${{ vars.HARBOR_USER }}
container-registry-project: ${{ vars.HARBOR_PROJECT }}
container-registry-repo: ${{ vars.HARBOR_REPO }}
github-app-id: ${{ vars.APP_ID }}
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
build-command: |
docker build -t $IMAGE -f containers/hive/Dockerfile .
secrets:
container-registry-token: ${{ secrets.HARBOR_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
slack-token: ${{ secrets.SLACK_TOKEN }}


Expand All @@ -70,22 +71,20 @@ jobs:
- slack
- changes
if: fromJSON(needs.changes.outputs.changes).chart == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-pr-update-chart.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-pr-update-chart.yaml@v3.0.0
with:
job-name: hive-chart
chart: charts/**
chart-registry: ${{ vars.HARBOR_REGISTRY }}
chart-registry-user: ${{ vars.HARBOR_USER }}
chart-registry-project: ${{ vars.HARBOR_PROJECT }}
chart-registry-repo: ${{ vars.HARBOR_REPO }}
github-app-id: ${{ vars.APP_ID }}
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
test-command: |
helm template $CHART --values charts/hive/values.yaml
secrets:
chart-registry-token: ${{ secrets.HARBOR_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
slack-token: ${{ secrets.SLACK_TOKEN }}

slack-update:
Expand All @@ -96,11 +95,11 @@ jobs:
- changes
- hive-container
- chart
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-pr-thread.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-pr-thread.yaml@v3.0.0
if: always()
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
status: ${{ contains(join(needs.*.result, ','), 'failure') && ':no_entry:' || ':white_check_mark:' }}
secrets:
slack-token: ${{ secrets.SLACK_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}
22 changes: 10 additions & 12 deletions .github/workflows/on-release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
branches:
- main

permissions:
# read needed for changes detection
# write needed to author a Github release
contents: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false
Expand All @@ -17,7 +22,7 @@ jobs:

slack:
# Open a new PR thread on Slack for this CI run
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-release-thread.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-release-thread.yaml@v3.0.0
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
secrets:
Expand All @@ -26,11 +31,10 @@ jobs:
changes:
# Detect which files have been changed on this PR's full history
needs: slack
uses: SwanseaUniversityMedical/workflows/.github/workflows/changes.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/changes.yaml@v3.0.0
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
github-app-id: ${{ vars.APP_ID }}
filters: |
hive-container:
- './.github/workflows/on-release.yaml'
Expand All @@ -41,7 +45,6 @@ jobs:
secrets:
slack-token: ${{ secrets.SLACK_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}

######################################################################################################################
# Container Tasks
Expand All @@ -53,11 +56,10 @@ jobs:
- slack
- changes
if: fromJSON(needs.changes.outputs.changes).hive-container == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-container.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-container.yaml@v3.0.0
with:
job-name: hive-container
container-registry: ${{ vars.HARBOR_REGISTRY }}
github-app-id: ${{ vars.APP_ID }}
container-registry-user: ${{ vars.HARBOR_USER }}
container-registry-project: ${{ vars.HARBOR_PROJECT }}
container-registry-repo: ${{ vars.HARBOR_REPO }}
Expand All @@ -69,8 +71,6 @@ jobs:
secrets:
container-registry-token: ${{ secrets.HARBOR_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}


######################################################################################################################
# Chart Tasks
Expand All @@ -82,23 +82,21 @@ jobs:
- slack
- changes
if: fromJSON(needs.changes.outputs.changes).chart == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-chart.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-chart.yaml@v3.0.0
with:
job-name: chart
chart-registry: ${{ vars.HARBOR_REGISTRY }}
chart-registry-user: ${{ vars.HARBOR_USER }}
chart-registry-project: ${{ vars.HARBOR_PROJECT }}
chart-registry-repo: ${{ vars.HARBOR_REPO }}
release-tag-format: 'DARE-Hive-Helm-${version}'
github-app-id: ${{ vars.APP_ID }}
slack-channel: ${{ vars.SLACK_CHANNEL }}
slack-thread: ${{ needs.slack.outputs.thread }}
chart: charts/**
test-command: |
helm template $CHART --values charts/hive/values.yaml
secrets:
chart-registry-token: ${{ secrets.HARBOR_TOKEN }}
github-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
slack-token: ${{ secrets.SLACK_TOKEN }}

######################################################################################################################
Expand All @@ -114,7 +112,7 @@ jobs:
- hive-container
- chart

uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-release-thread.yaml@v2.8.2
uses: SwanseaUniversityMedical/workflows/.github/workflows/slack-release-thread.yaml@v3.0.0
if: always()
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
Expand Down

0 comments on commit b7b5671

Please sign in to comment.