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.

Sign up for GitHub

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

Jump to bottom

chore: fix duplicate tag creation #310

Merged
merged 1 commit into from
Apr 12, 2023
Merged

chore: fix duplicate tag creation #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/publish-new-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.PAT }}
run: |
git for-each-ref refs/tags
git tag --delete ${{ steps.extract-version.outputs.release_version }}
git push --delete origin ${{ steps.extract-version.outputs.release_version }}
./Scripts/find-tag.sh ${{ steps.extract-version.outputs.release_version }} && git tag --delete ${{ steps.extract-version.outputs.release_version }} && git push --delete origin ${{ steps.extract-version.outputs.release_version }}
git tag -a v${{ steps.extract-version.outputs.release_version }} -m "chore: release v${{ steps.extract-version.outputs.release_version }}"
git push origin refs/tags/v${{ steps.extract-version.outputs.release_version }}
git for-each-ref refs/tags
DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js

- name: Create pull request into develop
Expand Down
12 changes: 11 additions & 1 deletion Rudder.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
ED04A246298424040080A88D /* ConserFilterHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConserFilterHandlerTests.swift; sourceTree = "<group>"; };
ED04A2482986C1750080A88D /* xccov-to-generic.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "xccov-to-generic.sh"; sourceTree = "<group>"; };
ED056314291AABFD00BAEE65 /* sonar-project.properties */ = {isa = PBXFileReference; lastKnownFileType = text; path = "sonar-project.properties"; sourceTree = "<group>"; };
ED1C4C8829E6CCC7007007C9 /* find-tag.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "find-tag.sh"; sourceTree = "<group>"; };
ED20F4E7299605F600F3FD0E /* multi-dataresidency-default-true.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "multi-dataresidency-default-true.json"; sourceTree = "<group>"; };
ED20F4E92996078B00F3FD0E /* eu-dataresidency-default-true.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "eu-dataresidency-default-true.json"; sourceTree = "<group>"; };
ED20F4EA2996078B00F3FD0E /* multi-dataresidency-default-false.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "multi-dataresidency-default-false.json"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -486,6 +487,14 @@
path = Tests;
sourceTree = "<group>";
};
ED1C4C8729E6CCC7007007C9 /* Scripts */ = {
isa = PBXGroup;
children = (
ED1C4C8829E6CCC7007007C9 /* find-tag.sh */,
);
path = Scripts;
sourceTree = "<group>";
};
ED20F4E62996059A00F3FD0E /* Fixtures */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -685,15 +694,16 @@
ED83FE5D2731019F006F27B3 /* CHANGELOG.md */,
ED857DF12912754400B7BFCE /* CODEOWNERS */,
ED857DF22912754400B7BFCE /* CONTRIBUTING.md */,
EDEC3CDA29ADEF87007DDE07 /* github-release.config.js */,
ED83FDB12731019F006F27B3 /* LICENSE */,
ED857DEF2912752300B7BFCE /* package.json */,
ED83FDAE2731019F006F27B3 /* Package.swift */,
ED83FE5E2731019F006F27B3 /* Podfile */,
ED83FDAF2731019F006F27B3 /* README.md */,
ED83FDB02731019F006F27B3 /* Rudder.podspec */,
ED1C4C8729E6CCC7007007C9 /* Scripts */,
ED056314291AABFD00BAEE65 /* sonar-project.properties */,
ED04A2482986C1750080A88D /* xccov-to-generic.sh */,
EDEC3CDA29ADEF87007DDE07 /* github-release.config.js */,
);
name = Others;
sourceTree = "<group>";
Expand Down
7 changes: 7 additions & 0 deletions Scripts/find-tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

if [ $(git tag -l "$1") ]; then
exit 0
else
exit 1
fi