diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 6e83456d0..dc0433f89 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -11,5 +11,5 @@ jobs: permissions: contents: write pull-requests: write - uses: go-openapi/ci-workflows/.github/workflows/auto-merge.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/auto-merge.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 secrets: inherit diff --git a/.github/workflows/bump-release.yml b/.github/workflows/bump-release.yml index c70241a26..c5a5012da 100644 --- a/.github/workflows/bump-release.yml +++ b/.github/workflows/bump-release.yml @@ -32,7 +32,7 @@ jobs: permissions: contents: write pull-requests: write - uses: go-openapi/ci-workflows/.github/workflows/bump-release-monorepo.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/bump-release-monorepo.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 with: bump-type: ${{ inputs.bump-type }} tag-message-title: ${{ inputs.tag-message-title }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a159bb95d..2644f63c7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -18,5 +18,5 @@ jobs: permissions: contents: read security-events: write - uses: go-openapi/ci-workflows/.github/workflows/codeql.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/codeql.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 secrets: inherit diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index d6c9ad927..e8541d59a 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -14,5 +14,5 @@ jobs: permissions: pull-requests: write contents: write - uses: go-openapi/ci-workflows/.github/workflows/contributors.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/contributors.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 secrets: inherit diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index e86a7df17..b907c6085 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -13,7 +13,7 @@ on: jobs: test: - uses: go-openapi/ci-workflows/.github/workflows/go-test-monorepo.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/go-test-monorepo.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 with: extra-flags: '-tags testcgo,testcolorized' # (1) this is to trigger extra tests in spew, (2) this is to enable integration test for colorized output secrets: inherit diff --git a/.github/workflows/scanner.yml b/.github/workflows/scanner.yml index 31be25ee7..c997eb4d6 100644 --- a/.github/workflows/scanner.yml +++ b/.github/workflows/scanner.yml @@ -15,5 +15,5 @@ jobs: permissions: contents: read security-events: write - uses: go-openapi/ci-workflows/.github/workflows/scanner.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # V0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/scanner.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 secrets: inherit diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 156f195fa..847d2385f 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -13,7 +13,7 @@ jobs: name: Create release permissions: contents: write - uses: go-openapi/ci-workflows/.github/workflows/release.yml@a94fc68a7e32794bbdc77ae00db80bd6567cb6f0 # v0.2.7 + uses: go-openapi/ci-workflows/.github/workflows/release.yml@565504edebe3ab7f7b4cbafc8d6f401b82e91c4c # v0.2.8 with: tag: ${{ github.ref_name }} is-monorepo: true diff --git a/hack/tag_modules.sh b/hack/tag_modules.sh deleted file mode 100755 index 4349e57eb..000000000 --- a/hack/tag_modules.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/bash -set -euo pipefail - -if [[ "$#" -ne 2 ]] ; then - echo "Usage: ${0##*/} {remote} {tag}" - echo "This command tags all modules as {module_name}/{tag} then pushes these tags to the selected remote." - echo "This is used whenever we want to level all modules at the same version." - exit 1 -fi - -remote="$1" -tag="$2" -root="$(git rev-parse --show-toplevel)" -declare -a all_tags - -cd "${root}" -echo "Tagging all modules in repo ${root##*/}..." - -while read module_location ; do - relative_location=${module_location#"$root"/} - relative_location=${relative_location#"$root"} - module_dir=${relative_location%"/go.mod"} - base_tag="${module_dir#"./"}" - if [[ "${base_tag}" == "" ]] ; then - module_tag="${tag}" # e.g. "v0.24.0" - else - module_tag="${base_tag}/${tag}" # e.g. "mangling/v0.24.0" - fi - all_tags+=("${module_tag}") - echo "Tag: ${module_tag}" - git tag "${module_tag}" -done < <(go list -f '{{.Dir}}' -m) - -echo "Pushing tags to ${remote}: ${all_tags[@]}" -git push "${remote}" ${all_tags[@]} diff --git a/hack/upgrade_modules.sh b/hack/upgrade_modules.sh deleted file mode 100755 index c2bc7fc79..000000000 --- a/hack/upgrade_modules.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash -new_tag=$1 - -cd "$(git rev-parse --show-toplevel)" -while read -r dir -do - pushd $dir - go list -deps -test \ - -f '{{ if .DepOnly }}{{ with .Module }}{{ .Path }}{{ end }}{{ end }}'|\ - sort -u|\ - grep "go-openapi/swag"|\ - while read -r module ; do - go mod edit -require "${module}@${new_tag}" - done - - go mod tidy - popd -done < <(find . -name go.mod |xargs dirname) - -go work sync