Skip to content

Commit

Permalink
Merge pull request #9 from petertonysmith94/release/fresher
Browse files Browse the repository at this point in the history
Retest the deployment
  • Loading branch information
petertonysmith94 authored Jan 22, 2024
2 parents 945ca18 + 5d57b8e commit beb18e7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: build
run-name: πŸš€ Build
run-name: πŸ—οΈ Build
on:
push:
branches:
- main
- master
- release/**

pull_request:
branches:
- main
- master
- release/**

permissions:
Expand All @@ -19,7 +19,7 @@ concurrency:

jobs:
build:
name: πŸš€ Build
name: πŸ—οΈ Build
runs-on: ubuntu-latest
steps:
- name: πŸ›ŽοΈ Checkout
Expand Down
22 changes: 8 additions & 14 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
name: deploy
run-name: πŸš€ Deploy

on:
workflow_run:
workflows: ["build"]
branches: ["main", "release/*"]
types:
workflows: [build]
branches: [master]
types:
- completed

env:
DEPLOY_PREVIEW: ${{ github.event.workflow_run.event == 'pull_request' }}
ARTIFACT_NAME: "build-artifact-${{ github.sha }}"



jobs:
deploy:
# Only run if the build was successful
if: ${{ github.event.workflow_run.conclusion == 'success' }}

if: ${{ github.event.workflow_run.conclusion == 'success' && github.ref == 'refs/heads/master' }}
name: πŸš€ Deploy
runs-on: ubuntu-latest
environment:
Expand All @@ -30,12 +24,12 @@ jobs:
id-token: write

steps:
- name: Deploy to GitHub Pages
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
with:
artifact_name: ${{ env.ARTIFACT_NAME}}
preview: ${{ env.DEPLOY_PREVIEW }}
artifact_name: "build-artifact-${{ github.sha }}"
preview: false

- name: Get the URL for the deployment
run: echo "${{ steps.deployment.outputs.page_url }}"

0 comments on commit beb18e7

Please sign in to comment.