Skip to content

Commit

Permalink
Merging main back to develop (#18)
Browse files Browse the repository at this point in the history
* Update build.yml - added conditions for PR

* bump version to 0.0.2

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
cqbanh and github-actions[bot] authored Mar 27, 2024
1 parent 1485acc commit 2566129
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
TARGET_ENV=${{ github.event.inputs.venue }}
- name: Bump alpha version
if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch'
if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
run: |
TAG=$(bumpver show -e | awk -F= '$1 == "TAG" {print $2};')
if [ $TAG == 'final' ]; then
Expand All @@ -92,12 +92,12 @@ jobs:
fi
echo "TARGET_ENV=SIT" >> $GITHUB_ENV
- name: Bump rc version
if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch'
if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
run: |
bumpver update -f --tag rc --tag-num
echo "TARGET_ENV=UAT" >> $GITHUB_ENV
- name: Release version
if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch'
if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
run: |
bumpver update -f --tag final
echo "TARGET_ENV=OPS" >> $GITHUB_ENV
Expand Down Expand Up @@ -128,9 +128,9 @@ jobs:
environment:
name: ${{ needs.build.outputs.deploy_env }}
if: |
github.ref == 'refs/heads/develop' ||
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release') ||
(github.ref == 'refs/heads/develop' && github.event_name != 'pull_request') ||
(github.ref == 'refs/heads/main' && github.event_name != 'pull_request') ||
(startsWith(github.ref, 'refs/heads/release') && github.event_name != 'pull_request') ||
github.event_name == 'workflow_dispatch'
steps:
- name: Configure AWS credentials
Expand Down
2 changes: 1 addition & 1 deletion bumpver.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpver]
current_version = "0.0.2-alpha14"
current_version = "0.0.2"
version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
commit = true
tag = true
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "swodlr-ingest-to-sds"
version = "0.0.2-alpha14"
version = "0.0.2"
description = "A system for ingesting input products for the SWOT SDS"
authors = ["podaac-tva <[email protected]>"]
license = "Apache-2.0"
Expand Down

0 comments on commit 2566129

Please sign in to comment.