Skip to content

Commit

Permalink
Merge pull request #188 from kbase/develop
Browse files Browse the repository at this point in the history
Develop -> Master (Release 1.3.6)
  • Loading branch information
MrCreosote authored May 19, 2023
2 parents f808a07 + 3c4d456 commit d41d38c
Show file tree
Hide file tree
Showing 14 changed files with 79 additions and 240 deletions.
28 changes: 0 additions & 28 deletions .github/workflows/build_prodrc_pr.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/build_test_pr.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/workflows/manual-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Manual Build & Push
on:
workflow_dispatch:
jobs:
build-push:
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}-develop'
tags: br-${{ github.ref_name }}
secrets: inherit
43 changes: 43 additions & 0 deletions .github/workflows/pr_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: Pull Request Build, Tag, & Push
on:
pull_request:
branches:
- develop
- main
- master
types:
- opened
- reopened
- synchronize
- closed
jobs:
build-develop-open:
if: github.base_ref == 'develop' && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_build.yml@main
secrets: inherit
build-develop-merge:
if: github.base_ref == 'develop' && github.event.pull_request.merged == true
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}-develop'
tags: pr-${{ github.event.number }},latest
secrets: inherit
build-main-open:
if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}'
tags: pr-${{ github.event.number }}
secrets: inherit
build-main-merge:
if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}'
tags: pr-${{ github.event.number }},latest-rc
secrets: inherit
trivy-scans:
if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@main
secrets: inherit
25 changes: 25 additions & 0 deletions .github/workflows/release-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Release - Build & Push Image
on:
release:
branches:
- main
- master
types: [ published ]
jobs:
check-source-branch:
uses: kbase/.github/.github/workflows/reusable_validate-branch.yml@main
with:
build_branch: '${{ github.event.release.target_commitish }}'
validate-release-tag:
needs: check-source-branch
uses: kbase/.github/.github/workflows/reusable_validate-release-tag.yml@main
with:
release_tag: '${{ github.event.release.tag_name }}'
build-push:
needs: validate-release-tag
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}'
tags: '${{ github.event.release.tag_name }},latest'
secrets: inherit
16 changes: 0 additions & 16 deletions .github/workflows/scripts/build_prodrc_pr.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/scripts/build_test_pr.sh

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/scripts/deploy_tag.sh

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/scripts/tag_environments.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/scripts/tag_prod_latest.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/scripts/tag_test_latest.sh

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/tag_environments.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/tag_prod_latest.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/tag_test_latest.yaml

This file was deleted.

0 comments on commit d41d38c

Please sign in to comment.