diff --git a/.github/ci/s3-website.yml b/.github/ci/s3-website.yml index 8dfc282..6a34115 100644 --- a/.github/ci/s3-website.yml +++ b/.github/ci/s3-website.yml @@ -18,7 +18,7 @@ Resources: - ServerSideEncryptionByDefault: SSEAlgorithm: 'AES256' DeletionPolicy: Delete - BuckeReadPolicy: + BucketReadPolicy: Type: AWS::S3::BucketPolicy Properties: Bucket: !Ref S3Bucket diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index 05d8f12..ae3d6c3 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.github/workflows/dev-deploy.yml @@ -45,6 +45,13 @@ permissions: contents: read jobs: + report-inputs: + runs-on: ubuntu-latest + steps: + - name: Report Inputs + run: | + export MESSAGE="tag=${{ inputs.tag }}, env-vars=${{ inputs.env-vars }}, enable-dry-run=${{ inputs.enable-dry-run }}, enable-size-only-run=${{ inputs.enable-size-only-run }}, enable-quiet-run=${{ inputs.enable-quiet-run }}" + echo "::notice title=Worfklow Inputs::$MESSAGE" check-out-tag: runs-on: ubuntu-latest steps: @@ -88,8 +95,8 @@ jobs: ref: ${{ inputs.tag }} - name: Install Buildenv uses: ntno/setup-buildenv@v1 - - name: Set Env Vars - id: set-env-vars + - name: Set Vars + id: set-vars run: | if [[ "${{ inputs.enable-dry-run }}" == "true" ]]; then export DRY_RUN="DRY_RUN=1" @@ -116,7 +123,7 @@ jobs: env-name: ${{ inputs.env-vars }} s3-bucket: ${{ env.deploy-target }} aws-region: us-east-1 - make-vars-for-deploy-target: ${{ steps.set-env-vars.outputs.deploy-flags }} + make-vars-for-deploy-target: ${{ steps.set-vars.outputs.deploy-flags }} role-to-assume: ${{ secrets.DEVELOPMENT_IAM_ROLE_ARN }} - name: Report Result run: | diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index ea3f203..19baf8d 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -90,21 +90,22 @@ jobs: - name: set-revision-sha id: set-revision-sha run: echo "revision-sha=${{ github.sha }}" >> $GITHUB_OUTPUT + - name: set-build-tag + id: set-build-tag + run: | + git init + echo "build-tag=$( git rev-parse --short ${{ github.sha }} )" >> $GITHUB_OUTPUT - name: stash-event-payload id: stash-event-payload run: | mkdir -p ./details cat ${{ github.event_path }} > ./details/event-payload.json echo "artifact-name=details/event-payload.json" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 + - name: upload-event-payload-artifact + uses: actions/upload-artifact@v3 with: name: event-payload.json path: ./details/ - - name: set-build-tag - id: set-build-tag - run: | - git init - echo "build-tag=$( git rev-parse --short ${{ github.sha }} )" >> $GITHUB_OUTPUT - name: inspect-outputs id: inspect-outputs run: | diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index 55d36d6..4ed7aae 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -48,7 +48,7 @@ jobs: --template-body file://s3-website.yml \ --stack-name "${{ env.stack-name }}" \ --parameters ParameterKey=BucketName,ParameterValue="${{ env.bucket-name }}" \ - --on-failure DO_NOTHING \ + --on-failure DELETE \ --capabilities CAPABILITY_NAMED_IAM aws cloudformation wait stack-create-complete --stack-name "${{ env.stack-name }}" aws s3 cp --sse AES256 --acl public-read index.html "s3://${{ env.bucket-name }}/" diff --git a/.github/workflows/pages-deploy.yml b/.github/workflows/pages-deploy.yml index 42abec8..ae22db3 100644 --- a/.github/workflows/pages-deploy.yml +++ b/.github/workflows/pages-deploy.yml @@ -29,6 +29,13 @@ permissions: contents: read jobs: + report-inputs: + runs-on: ubuntu-latest + steps: + - name: Report Inputs + run: | + export MESSAGE="tag=${{ inputs.tag }}, env-vars=${{ inputs.env-vars }}" + echo "::notice title=Worfklow Inputs::$MESSAGE" check-out-tag: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml index 08c0270..cfb4b47 100644 --- a/.github/workflows/prod-deploy.yml +++ b/.github/workflows/prod-deploy.yml @@ -45,6 +45,13 @@ permissions: contents: read jobs: + report-inputs: + runs-on: ubuntu-latest + steps: + - name: Report Inputs + run: | + export MESSAGE="tag=${{ inputs.tag }}, env-vars=${{ inputs.env-vars }}, enable-dry-run=${{ inputs.enable-dry-run }}, enable-size-only-run=${{ inputs.enable-size-only-run }}, enable-quiet-run=${{ inputs.enable-quiet-run }}" + echo "::notice title=Worfklow Inputs::$MESSAGE" check-out-tag: runs-on: ubuntu-latest steps: @@ -88,8 +95,8 @@ jobs: ref: ${{ inputs.tag }} - name: Install Buildenv uses: ntno/setup-buildenv@v1 - - name: Set Env Vars - id: set-env-vars + - name: Set Vars + id: set-vars run: | if [[ "${{ inputs.enable-dry-run }}" == "true" ]]; then export DRY_RUN="DRY_RUN=1" @@ -116,7 +123,7 @@ jobs: env-name: ${{ inputs.env-vars }} s3-bucket: ${{ env.deploy-target }} aws-region: us-east-1 - make-vars-for-deploy-target: ${{ steps.set-env-vars.outputs.deploy-flags }} + make-vars-for-deploy-target: ${{ steps.set-vars.outputs.deploy-flags }} role-to-assume: ${{ secrets.PRODUCTION_IAM_ROLE_ARN }} - name: Report Result run: |