diff --git a/.github/workflows/go-versions.yml b/.github/workflows/go-versions.yml deleted file mode 100644 index efba4b52..00000000 --- a/.github/workflows/go-versions.yml +++ /dev/null @@ -1,49 +0,0 @@ -# The following chunk of yml boils down to pulling two Go version numbers out of a file and -# making them available to the other workflows in a convenient fashion. -# -# It's a reusable workflow instead of an action so that its output can be used in a matrix strategy -# of another job. -# -# The idea is to define the most recent, and penultimate, Go versions that should be used to test Relay. -# Ideally we'd define these in a single place - otherwise we'd need to update many different places in -# each workflow. This single place is .github/variables/go-versions.env. -# -# This reusable workflow grabs them out of the file, then sets them as outputs. As a convenience, it -# also wraps each version in an array, so it can be directly used in a matrix strategy. Single-item matrices -# are nice because you can tell instantly in the Github UI which version is being tested without needing -# to inspect logs. -# -# To use a matrix output, e.g. latest version, do: -# strategy: -# matrix: ${{ fromJSON(this-job.outputs.latest-matrix) }} -# -name: Go Versions -on: - workflow_call: - outputs: - latest: - description: 'The most recent Go version to test' - value: ${{ jobs.go-versions.outputs.latest }} - penultimate: - description: 'The second most recent Go version to test' - value: ${{ jobs.go-versions.outputs.penultimate }} - matrix: - description: 'All Go versions to test as a matrix' - value: ${{ jobs.go-versions.outputs.all }} - -jobs: - go-versions: - runs-on: ubuntu-latest - outputs: - latest: ${{ steps.set-env.outputs.latest }} - penultimate: ${{ steps.set-env.outputs.penultimate }} - all: ${{ steps.set-matrix.outputs.all }} - steps: - - uses: actions/checkout@v4 - - name: Set Go Versions - id: set-env - run: cat ./.github/variables/go-versions.env > $GITHUB_OUTPUT - - name: Set Go Version Matrices - id: set-matrix - run: | - echo "all=[\"${{ steps.set-env.outputs.latest }}\",\"${{ steps.set-env.outputs.penultimate }}\"]" >> $GITHUB_OUTPUT \ No newline at end of file diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 26fd003b..a39974f2 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -6,9 +6,6 @@ on: - main jobs: - go-versions: - uses: ./.github/workflows/go-versions.yml - release-please: runs-on: ubuntu-latest outputs: @@ -18,36 +15,4 @@ jobs: - uses: google-github-actions/release-please-action@v4 id: release with: - token: ${{secrets.GITHUB_TOKEN}} - - release-relay: - permissions: - id-token: write # Needed to obtain Docker tokens - contents: write # Needed to upload release artifacts - - needs: [ release-please, go-versions ] - if: ${{ needs.release-please.outputs.release_created == 'true' }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.0.1 - name: 'Get Docker token' - with: - aws_assume_role: ${{ vars.AWS_ROLE_ARN }} - ssm_parameter_pairs: '/global/services/docker/public/username = DOCKER_USERNAME, /global/services/docker/public/token = DOCKER_TOKEN' - - - name: Setup Go ${{ needs.go-versions.outputs.latest }} - uses: actions/setup-go@v4 - with: - go-version: ${{ needs.go-versions.outputs.latest }} - - # - uses: ./.github/actions/unit-tests - - - uses: ./.github/actions/publish - with: - dry-run: 'true' - token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ needs.release-please.outputs.tag_name }} \ No newline at end of file + token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/release-please-config.yml b/release-please-config.yml index 000e9b89..774ed742 100644 --- a/release-please-config.yml +++ b/release-please-config.yml @@ -4,10 +4,10 @@ "release-type": "go", "bump-minor-pre-major": true, "versioning": "default", - "bootstrap-sha": "0cf0540c8555b3b57b013ee1f4e7bf16ad486ab2", + "bootstrap-sha": "0102c9eec733b9c8c20f59108b54162e3262de0a", "include-component-in-tag" : false, "extra-files": [ - "relay/version/version.go" + "version/version.go" ] } }