From 65b656968f298adfb984fc21928f4c41899fb771 Mon Sep 17 00:00:00 2001 From: Curtis Banh <30607061+cqbanh@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:26:08 -0700 Subject: [PATCH 1/8] merging main back to develop (#19) * 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> From c0767ad78a963ad90c5129f1658c74acf44f0bb4 Mon Sep 17 00:00:00 2001 From: cqbanh Date: Wed, 27 Mar 2024 08:16:21 +0000 Subject: [PATCH 2/8] Deploying --- CHANGE | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGE diff --git a/CHANGE b/CHANGE new file mode 100644 index 0000000..199c9e5 --- /dev/null +++ b/CHANGE @@ -0,0 +1 @@ +podaac/swodlr-ingest-to-sds deployment From d75202e9b49eb56cab71a95c57a6ffba93456586 Mon Sep 17 00:00:00 2001 From: Curtis Banh <30607061+cqbanh@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:01:59 -0700 Subject: [PATCH 3/8] cicd - update on push branches --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02ca207..ad076af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,13 @@ name: Build 'n Deploy on: push: branches: - - '*' + - main + - develop + - 'release/**' + - 'feature/**' + - 'issue/**' + - 'issues/**' + - 'dependabot/**' tags-ignore: - '*' paths-ignore: From 74ddcef4fb04c2619faa1c140daeac8f5e8f8554 Mon Sep 17 00:00:00 2001 From: Curtis Banh Date: Wed, 27 Mar 2024 04:16:20 -0700 Subject: [PATCH 4/8] bump version --- bumpver.toml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bumpver.toml b/bumpver.toml index 96d7764..9f964b7 100644 --- a/bumpver.toml +++ b/bumpver.toml @@ -1,5 +1,5 @@ [bumpver] -current_version = "1.0.0" +current_version = "1.0.0-alpha0" version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]" commit = true tag = true diff --git a/pyproject.toml b/pyproject.toml index 94e22f6..8c33786 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "swodlr-ingest-to-sds" -version = "1.0.0" +version = "1.0.0-alpha0" description = "A system for ingesting input products for the SWOT SDS" authors = ["podaac-tva "] license = "Apache-2.0" From 0dd1ac93f6697a018cc28975db5c953a370272b3 Mon Sep 17 00:00:00 2001 From: cqbanh Date: Wed, 27 Mar 2024 12:07:08 +0000 Subject: [PATCH 5/8] Deploying --- CHANGE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGE b/CHANGE index 199c9e5..d2c8dd7 100644 --- a/CHANGE +++ b/CHANGE @@ -1 +1,2 @@ podaac/swodlr-ingest-to-sds deployment +podaac/swodlr-ingest-to-sds deployment From bad400040f8dacd7ac678a32be9ff68856d61a8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:07:50 +0000 Subject: [PATCH 6/8] bump version to 1.0.0-rc0 --- bumpver.toml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bumpver.toml b/bumpver.toml index 9f964b7..9097e92 100644 --- a/bumpver.toml +++ b/bumpver.toml @@ -1,5 +1,5 @@ [bumpver] -current_version = "1.0.0-alpha0" +current_version = "1.0.0-rc0" version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]" commit = true tag = true diff --git a/pyproject.toml b/pyproject.toml index 8c33786..2352fac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "swodlr-ingest-to-sds" -version = "1.0.0-alpha0" +version = "1.0.0-rc0" description = "A system for ingesting input products for the SWOT SDS" authors = ["podaac-tva "] license = "Apache-2.0" From 4ec3fdd8eea2d80ba3f7225a528c8fee05b24114 Mon Sep 17 00:00:00 2001 From: cqbanh Date: Wed, 27 Mar 2024 12:14:24 +0000 Subject: [PATCH 7/8] Deploying --- CHANGE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGE b/CHANGE index d2c8dd7..dd34cfb 100644 --- a/CHANGE +++ b/CHANGE @@ -1,2 +1,3 @@ podaac/swodlr-ingest-to-sds deployment podaac/swodlr-ingest-to-sds deployment +podaac/swodlr-ingest-to-sds deployment From 138e1f98e27e5c6f32e6388ba28d834135c9d082 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:15:35 +0000 Subject: [PATCH 8/8] bump version to 1.0.0-rc1 --- bumpver.toml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bumpver.toml b/bumpver.toml index 9097e92..4511948 100644 --- a/bumpver.toml +++ b/bumpver.toml @@ -1,5 +1,5 @@ [bumpver] -current_version = "1.0.0-rc0" +current_version = "1.0.0-rc1" version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]" commit = true tag = true diff --git a/pyproject.toml b/pyproject.toml index 2352fac..4973670 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "swodlr-ingest-to-sds" -version = "1.0.0-rc0" +version = "1.0.0-rc1" description = "A system for ingesting input products for the SWOT SDS" authors = ["podaac-tva "] license = "Apache-2.0"