Skip to content

Commit

Permalink
tidy and github actions updates (#831)
Browse files Browse the repository at this point in the history
* run tidy before generate-mocks

* upgrades for deprecated actions and set-output

* missed a couple
  • Loading branch information
jenshu authored May 10, 2023
1 parent b2de541 commit a085081
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lts-branch-create-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Cancel Previous Actions
uses: styfle/cancel-workflow-action@0.4.1
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}
- name: Checkout Branch
Expand All @@ -31,8 +31,8 @@ jobs:
DESTINATION_BRANCH=$(echo $GITHUB_BRANCH_NAME | cut -f $DEST_BRANCH_FIELD_NUMBER -d $DELIMITER )
TAG_NAME=$(echo $GITHUB_BRANCH_NAME | cut -f $TAG_NAME_FIELD_NUMBER -d $DELIMITER )
echo "::set-output name=destination_branch::$(echo $DESTINATION_BRANCH )"
echo "::set-output name=tag_name::$(echo $TAG_NAME )"
echo "destination_branch=$DESTINATION_BRANCH" >> $GITHUB_OUTPUT
echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
- name: Setup Git
env:
GIT_USER_NAME: soloio-bot
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lts-branch-tag-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
COMMIT_REGEX: "^.*(Sync APIs.)+.*$"
steps:
- name: Cancel Previous Actions
uses: styfle/cancel-workflow-action@0.4.1
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
Expand All @@ -25,7 +25,7 @@ jobs:
if [[ $(git log -1 --oneline) =~ ${{ env.COMMIT_REGEX }} ]]; then
TAG_NAME=$(git log -1 --oneline | awk -F'@tag-name=' '{print $2}' | awk -F' ' '{print $1}')
fi
echo "::set-output name=tag_name::$(echo $TAG_NAME)"
echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
- name: Bump version and push tag
if: steps.tag_version.outputs.tag_name != ''
uses: anothrNick/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.4.0
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
Expand All @@ -21,7 +21,7 @@ jobs:
go-version-file: go.mod
id: go
- name: Install Protoc
uses: solo-io/setup-protoc@master
uses: arduino/setup-protoc@master
with:
version: '3.6.1'
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.4.0
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ generate-code:
PATH=$(DEPSGOBIN):$$PATH ./hack/post-generate.sh

.PHONY: generate-mocks
generate-mocks:
generate-mocks: tidy
PATH=$(DEPSGOBIN):$$PATH go generate ./...

.PHONY: tidy
Expand Down

0 comments on commit a085081

Please sign in to comment.