Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update x/crypto #366

Merged
merged 8 commits into from
Dec 18, 2024
Merged

Update x/crypto #366

merged 8 commits into from
Dec 18, 2024

Conversation

jenae-janzen
Copy link
Contributor

- Summary
Fixes: https://github.com/netlify/gotrue/security/dependabot/25

- Test plan

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@jenae-janzen jenae-janzen requested a review from a team as a code owner December 16, 2024 20:47
@jenae-janzen
Copy link
Contributor Author

jenae-janzen commented Dec 17, 2024

@rybit, I was wondering if you had any suggestions here --
Initially, all the checks were failing. I updated the go version, which seemed to help, but now I'm seeing
Screenshot 2024-12-17 at 2 34 19 PM

When I ran go mod tidy, the version of golang.org/x/net was set to v0.25.0. I tried following the instructions in the error message and resetting it to v0.21.0, but every time I run go mod tidy it sets it back to v0.25.0. Do you have any ideas how to work around this?

@rybit
Copy link
Member

rybit commented Dec 17, 2024

I suspect that the problem is you're building with 1.15 & 1.16: https://github.com/netlify/gotrue/blob/master/.github/workflows/test.yaml#L12

@jenae-janzen
Copy link
Contributor Author

jenae-janzen commented Dec 17, 2024

@rybit, you were spot on about the tests building with the wrong version! It seems like now I'm stuck on the same problem Ramon was having in this pr, where triggering circleci by calling https://circleci.com/api/v2/project/gh/netlify/gotrue-ci/pipeline is failing with a 404

@rybit
Copy link
Member

rybit commented Dec 17, 2024

Not sure where you're seeing that? I think other than the 1.15 (which won't work it seems) this is going through?

@jenae-janzen jenae-janzen enabled auto-merge (squash) December 18, 2024 14:53
@jenae-janzen
Copy link
Contributor Author

@rybit ah, I'm not sure why I thought that, but for some reason it seems like the test (1.15.x) step is required to merge, and looking in the test.yaml file there's this block:

      - name: Trigger CircleCI for deployment
        if: ${{ (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'netlify/gotrue') && matrix.go-version == '1.15.x' }}
        run: |
          curl -X POST --silent --show-error --fail \
            -H 'Circle-Token: ${{ secrets.CIRCLE_TOKEN }}' \
            -H 'content-type: application/json' \
            --data '{ "branch": "master", "parameters": { "branch": "${{ github.event.pull_request.head.ref || github.ref_name }}", "commit": "${{ github.event.pull_request.head.sha || github.sha }}" } }' \
            https://circleci.com/api/v2/project/gh/netlify/gotrue-ci/pipeline

I tried switching it to run for 1.22 instead, but that's when I saw
Screenshot 2024-12-18 at 11 30 19 AM

@rybit
Copy link
Member

rybit commented Dec 18, 2024

I removed the 1.15x requirement and changed it to 1.22. I'm betting that check is so that we can trigger the internal deployment mechanism in that repo. Worth maybe figuring out what those calls are for. idk if you need to make like a matching branch in that repo.

@jenae-janzen jenae-janzen merged commit 69e4d99 into master Dec 18, 2024
5 checks passed
@jenae-janzen jenae-janzen deleted the update-x-crypto branch December 18, 2024 18:52
@jenae-janzen
Copy link
Contributor Author

Thanks for all your help @rybit!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants