Skip to content

Commit

Permalink
Merge pull request #621 from hjiawei/marvin-token-actions
Browse files Browse the repository at this point in the history
Use tigera-marvin github token for actions
  • Loading branch information
hjiawei authored Jan 3, 2025
2 parents 07368ae + f5b29a3 commit 5bc8d09
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-branch-on-go-version-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
else
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git remote set-url origin https://x-access-token:${{ secrets.MARVIN_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git checkout -b "$branch_name"
git push origin "$branch_name"
echo "Created Git branch $branch_name"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-tag-on-version-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ jobs:
- name: Create and push new tag (if not exists)
run: |
tag_name=${{ steps.generate-tag-name.outputs.tag_name }}
count=$(git ls-remote --tags origin "$tag_name" | grep -c "refs/tags/$tag_name")
count=$(git ls-remote --tags origin "$tag_name" | grep -c "refs/tags/$tag_name" || :)
if [ "$count" -gt 0 ] ; then
echo "Git tag $tag_name already exists. Using new tag $tag_name-$count."
tag_name="$tag_name-$count"
fi
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git remote set-url origin https://x-access-token:${{ secrets.MARVIN_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git tag -a "$tag_name" -m "Release $tag_name"
git push origin "$tag_name"
echo "Created Git tag $tag_name"

0 comments on commit 5bc8d09

Please sign in to comment.