Skip to content

Commit

Permalink
Merge pull request #47 from alphagov/use-new-release-workflow
Browse files Browse the repository at this point in the history
Use new release workflow
  • Loading branch information
nimalank7 authored Jun 14, 2024
2 parents 53ffda8 + 452aa2d commit d37e554
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ on:
required: true
type: string
default: 'main'
release:
types: [released]

jobs:
build-and-publish-image:
if: github.event_name == 'workflow_dispatch' || startsWith(github.ref_name, 'v')
name: Build and publish image
uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
with:
gitRef: ${{ inputs.gitRef || github.ref }}
gitRef: ${{ inputs.gitRef || github.ref_name }}
permissions:
id-token: write
contents: read
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Release

on:
workflow_dispatch:
workflow_run:
workflows: [CI]
types: [completed]
branches: [main]

jobs:
release:
if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
name: Release
uses: alphagov/govuk-infrastructure/.github/workflows/release.yml@main
secrets:
GH_TOKEN: ${{ secrets.GOVUK_CI_GITHUB_API_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore bundler config
/.bundle

0 comments on commit d37e554

Please sign in to comment.