From 7f0bf1f552a5d8a79030b0980cd262e1222943b7 Mon Sep 17 00:00:00 2001 From: Vijay Vammi Date: Wed, 14 Feb 2024 21:42:51 +0000 Subject: [PATCH 1/4] fix: ci process --- .github/workflows/pr.yaml | 2 -- .github/workflows/release.yaml | 15 +++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e6a75bdb..53883d31 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,7 +1,5 @@ on: pull_request: - paths: - - "magnus/**" branches: - "main" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 999a6c2c..155a91ca 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,10 +1,9 @@ on: push: - paths: - - "magnus/**" branches: - "main" - "rc" + - "release" jobs: PRCheck: @@ -29,10 +28,10 @@ jobs: # Test installation argo version - - run: python -m pip install poetry - - run: | - python -m poetry install - poetry run tox + # - run: python -m pip install poetry + # - run: | + # python -m poetry install + # poetry run tox Release: runs-on: ubuntu-latest @@ -53,7 +52,7 @@ jobs: CURRENT=$(git tag --sort=-committerdate -l | head -n 1) echo "current: $CURRENT" - VERSION=$(python -m semantic-release --noop --strict version --no-push --no-commit --print) + VERSION=$(semantic-release --noop --strict version --no-push --no-commit --print) echo "New: $VERSION" if [ "$CURRENT" == "$VERSION" ]; then @@ -62,7 +61,7 @@ jobs: fi echo "version=$VERSION" >> $GITHUB_OUTPUT - exit 0 + exit 1 # change this - name: Apply new tag if: steps.last_tag.outcome == 'success' From 2ac83b8de1c9399e1f693e6f5b6af4b9e1db42ff Mon Sep 17 00:00:00 2001 From: Vijay Vammi Date: Wed, 14 Feb 2024 21:44:45 +0000 Subject: [PATCH 2/4] fix: ci process --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 3113261c..38e1dc1c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -191,6 +191,10 @@ tag_format = "{version}" [tool.semantic_release.branches.main] match = "main" +# Remove this +[tool.semantic_release.branches.release] +match = "release" + [tool.semantic_release.branches."rc"] match = "rc" prerelease = true From ed216c75ae871346ff0943f0434a40327cd44691 Mon Sep 17 00:00:00 2001 From: Vijay Vammi Date: Wed, 14 Feb 2024 21:47:43 +0000 Subject: [PATCH 3/4] fix: ci process --- .github/workflows/release.yaml | 4 ++-- pyproject.toml | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 155a91ca..ad894144 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -56,12 +56,12 @@ jobs: echo "New: $VERSION" if [ "$CURRENT" == "$VERSION" ]; then - echo "version="" >> $GITHUB_OUTPUT + echo "version=$VERSION" >> $GITHUB_OUTPUT exit 1 fi echo "version=$VERSION" >> $GITHUB_OUTPUT - exit 1 # change this + exit 0 - name: Apply new tag if: steps.last_tag.outcome == 'success' diff --git a/pyproject.toml b/pyproject.toml index 38e1dc1c..3113261c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -191,10 +191,6 @@ tag_format = "{version}" [tool.semantic_release.branches.main] match = "main" -# Remove this -[tool.semantic_release.branches.release] -match = "release" - [tool.semantic_release.branches."rc"] match = "rc" prerelease = true From 3de5eebfcbc0d416a3f35560f1176b167abd6175 Mon Sep 17 00:00:00 2001 From: Vijay Vammi Date: Wed, 14 Feb 2024 21:48:09 +0000 Subject: [PATCH 4/4] fix: ci process --- .github/workflows/release.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ad894144..6aef44ce 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,6 @@ on: branches: - "main" - "rc" - - "release" jobs: PRCheck: @@ -28,10 +27,10 @@ jobs: # Test installation argo version - # - run: python -m pip install poetry - # - run: | - # python -m poetry install - # poetry run tox + - run: python -m pip install poetry + - run: | + python -m poetry install + poetry run tox Release: runs-on: ubuntu-latest