diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 8508f9c..36e93a3 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -6,8 +6,13 @@ jobs: lint: runs-on: ubuntu-latest steps: +<<<<<<< HEAD + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@v2 +======= - uses: actions/checkout@v2 - uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5 +>>>>>>> main with: go-version: "1.23" - name: Run gofmt @@ -33,7 +38,7 @@ jobs: fail-fast: true runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5 with: go-version: "1.23" @@ -54,12 +59,12 @@ jobs: fail-fast: true runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install Go uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Build run: go build ./...