Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update DEVOPS-728 Branch #440

Merged
merged 25 commits into from
Mar 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0399443
Testing tag envs
jsfillman Mar 1, 2022
1fb44a2
Testing tag envs
jsfillman Mar 1, 2022
c8987b0
Merge pull request #22 from jsfillman/DEVOPS-728-ghatags
jsfillman Mar 1, 2022
11b58dd
Merge pull request #23 from jsfillman/develop
jsfillman Mar 1, 2022
62055dd
Testing tag envs
jsfillman Mar 1, 2022
5dffd49
Merge pull request #24 from jsfillman/DEVOPS-728-ghatags
jsfillman Mar 1, 2022
2335955
Merge pull request #25 from jsfillman/develop
jsfillman Mar 1, 2022
e6f9598
Adding semver check in prod_release workflow
jsfillman Mar 1, 2022
33435b0
Merge pull request #28 from jsfillman/DEVOPS-728-ghatags
jsfillman Mar 1, 2022
7efad9f
Merge pull request #29 from jsfillman/develop
jsfillman Mar 1, 2022
3fd4b1d
Adding semver check in prod_release workflow
jsfillman Mar 1, 2022
a3ce986
Merge pull request #30 from jsfillman/DEVOPS-728-ghatags
jsfillman Mar 1, 2022
a90be5b
Merge pull request #31 from jsfillman/develop
jsfillman Mar 1, 2022
a723f91
Update prod_release.yaml
jsfillman Mar 1, 2022
3f2a7bf
Update prod_release.yaml
jsfillman Mar 1, 2022
427f644
Update prod_release.yaml
jsfillman Mar 1, 2022
0138996
Update prod_release.yaml
jsfillman Mar 1, 2022
7e786cb
Update prod_release.yaml
jsfillman Mar 1, 2022
494511e
Update prod_release.yaml
jsfillman Mar 1, 2022
0c93eff
Update prod_release.yaml
jsfillman Mar 1, 2022
40236a0
Update prod_release.yaml
jsfillman Mar 1, 2022
390987f
Update prod_release.yaml
jsfillman Mar 1, 2022
fcdb2df
Adding final semver check to prod release workflow
jsfillman Mar 1, 2022
162dad3
Merge pull request #32 from jsfillman/DEVOPS-728-ghatags
jsfillman Mar 1, 2022
267516f
Merge pull request #33 from jsfillman/develop
jsfillman Mar 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_prodrc_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
docker_build:
runs-on: ubuntu-latest
steps:
- name: Verify merge is develop > main
- name: Verify merge is develop -> main
if: github.head_ref != 'develop'
run: exit 1 // Must merge from develop > main/master
run: echo "Must merge from develop -> main/master"; exit 1
- name: Check out GitHub Repo
if: github.event.pull_request.draft == false && github.head_ref == 'develop'
with:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/prod_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ jobs:
docker_build:
runs-on: ubuntu-latest
steps:
- name: Check Tag
id: check-tag
run: |-
if [[ ${{ github.ref_name }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo ::set-output name=match::true
fi
- name: Report SemVer Check
if: steps.check-tag.outputs.match != 'true'
run: echo "Release version must follow semantic naming (e.g. 1.0.2)"; exit 1
- name: Check out GitHub Repo
with:
ref: "${{ github.event.pull_request.head.sha }}"
Expand All @@ -22,4 +31,4 @@ jobs:
VER: "${{ github.event.release.tag_name }}"
DOCKER_ACTOR: "${{ secrets.GHCR_USERNAME }}"
DOCKER_TOKEN: "${{ secrets.GHCR_TOKEN }}"
run: "./.github/workflows/scripts/prod_release.sh\n"
run: "./.github/workflows/scripts/prod_release.sh\n"
2 changes: 1 addition & 1 deletion .github/workflows/scripts/prod_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
export BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
export COMMIT=$(echo "$SHA" | cut -c -7)


echo "Ref name is:" $GITHUB_REF_NAME
echo $DOCKER_TOKEN | docker login ghcr.io -u $DOCKER_ACTOR --password-stdin
docker build --build-arg BUILD_DATE="$DATE" \
--build-arg COMMIT="$COMMIT" \
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store
.idea
test/test.cfg
test_local
__pycache__
Expand Down