Skip to content

Commit 9bb6d3e

Browse files
benjaminpbenjaminp
authored
update dependencies (#73)
1 parent de8695f commit 9bb6d3e

9 files changed

Lines changed: 82 additions & 90 deletions

File tree

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3.1
1+
9.1.0

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ jobs:
3838
- self-hosted
3939
- os=linux
4040
- arch=x64
41+
- "engflow-cluster=glass"
4142
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
4243
- "engflow-pool=ci_sysbox_x64"
4344
- "engflow-runtime=sysbox-runc"
4445
- "engflow-runner-id=${{ github.repository_id }}_bazel-builder_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
46+
- "engflow-run-id=${{ github.run_id }}"
4547
timeout-minutes: 30
4648

4749
env:
@@ -116,10 +118,12 @@ jobs:
116118
- self-hosted
117119
- os=linux
118120
- arch=x64
121+
- "engflow-cluster=glass"
119122
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
120123
- "engflow-pool=ci_sysbox_x64"
121124
- "engflow-runtime=sysbox-runc"
122125
- "engflow-runner-id=${{ github.repository_id }}_golang-builder-ci-runners_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
126+
- "engflow-run-id=${{ github.run_id }}"
123127
timeout-minutes: 10
124128

125129
env:
@@ -147,10 +151,12 @@ jobs:
147151
- self-hosted
148152
- os=linux
149153
- arch=x64
154+
- "engflow-cluster=glass"
150155
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
151156
- "engflow-pool=ci_sysbox_x64"
152157
- "engflow-runtime=sysbox-runc"
153158
- "engflow-runner-id=${{ github.repository_id }}_copyright-headers-check_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
159+
- "engflow-run-id=${{ github.run_id }}"
154160
timeout-minutes: 10
155161

156162
env:

‎.github/workflows/presubmit.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ jobs:
3939
- self-hosted
4040
- os=linux
4141
- arch=x64
42+
- "engflow-cluster=glass"
4243
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
4344
- "engflow-pool=ci_sysbox_x64"
4445
- "engflow-runtime=sysbox-runc"
4546
- "engflow-runner-id=${{ github.repository_id }}_bazel-builder_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
47+
- "engflow-run-id=${{ github.run_id }}"
4648
timeout-minutes: 30
4749

4850
env:
@@ -121,10 +123,12 @@ jobs:
121123
- self-hosted
122124
- os=linux
123125
- arch=x64
126+
- "engflow-cluster=glass"
124127
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
125128
- "engflow-pool=ci_sysbox_x64"
126129
- "engflow-runtime=sysbox-runc"
127130
- "engflow-runner-id=${{ github.repository_id }}_golang-builder-ci-runners_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
131+
- "engflow-run-id=${{ github.run_id }}"
128132
timeout-minutes: 10
129133

130134
env:
@@ -152,10 +156,12 @@ jobs:
152156
- self-hosted
153157
- os=linux
154158
- arch=x64
159+
- "engflow-cluster=glass"
155160
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
156161
- "engflow-pool=ci_sysbox_x64"
157162
- "engflow-runtime=sysbox-runc"
158163
- "engflow-runner-id=${{ github.repository_id }}_copyright-headers-check_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
164+
- "engflow-run-id=${{ github.run_id }}"
159165
timeout-minutes: 10
160166

161167
env:

‎MODULE.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ module(
55
version = "1.0.0",
66
)
77

8-
bazel_dep(name = "gazelle", version = "0.44.0")
9-
bazel_dep(name = "platforms", version = "1.0.0")
10-
bazel_dep(name = "rules_cc", version = "0.1.2")
11-
bazel_dep(name = "rules_go", version = "0.55.1")
8+
bazel_dep(name = "gazelle", version = "0.50.0")
9+
bazel_dep(name = "platforms", version = "1.1.0")
10+
bazel_dep(name = "rules_cc", version = "0.2.18")
11+
bazel_dep(name = "rules_go", version = "0.60.0")
1212

1313
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
14-
go_sdk.download(version = "1.24.5")
14+
go_sdk.download(version = "1.26.2")
1515

1616
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
1717
go_deps.from_file(go_mod = "//:go.mod")

‎WORKSPACE‎

Whitespace-only changes.

‎go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
module github.com/EngFlow/auth
22

3-
go 1.24.5
3+
go 1.25.0
44

55
require (
6-
github.com/EngFlow/credential-helper-go v0.0.0-20250604061407-6ba182beab5f
7-
github.com/golang-jwt/jwt/v5 v5.2.2
6+
github.com/EngFlow/credential-helper-go v0.0.0-20260320063250-1f92d5f713f4
7+
github.com/golang-jwt/jwt/v5 v5.3.1
88
github.com/google/uuid v1.6.0
9-
github.com/stretchr/testify v1.9.0
9+
github.com/stretchr/testify v1.11.1
1010
github.com/urfave/cli/v2 v2.27.7
11-
github.com/zalando/go-keyring v0.2.6
12-
golang.org/x/oauth2 v0.30.0
11+
github.com/zalando/go-keyring v0.2.8
12+
golang.org/x/oauth2 v0.36.0
1313
)
1414

1515
require (
16-
al.essio.dev/pkg/shellescape v1.6.0 // indirect
17-
github.com/alessio/shellescape v1.4.2 // indirect
1816
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
19-
github.com/danieljoos/wincred v1.2.2 // indirect
17+
github.com/danieljoos/wincred v1.2.3 // indirect
2018
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/godbus/dbus/v5 v5.1.0 // indirect
19+
github.com/godbus/dbus/v5 v5.2.2 // indirect
2220
github.com/pmezard/go-difflib v1.0.0 // indirect
2321
github.com/russross/blackfriday/v2 v2.1.0 // indirect
2422
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
25-
golang.org/x/sys v0.33.0 // indirect
23+
golang.org/x/sys v0.43.0 // indirect
2624
gopkg.in/yaml.v3 v3.0.1 // indirect
2725
)

‎go.sum‎

Lines changed: 18 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
1-
al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA=
2-
al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
3-
github.com/EngFlow/credential-helper-go v0.0.0-20240531061116-25d7df71cdb6 h1:kfaS6zYc66RDF/E+ROBIMvRpIfdPLUwqEtTY0h8+XuU=
4-
github.com/EngFlow/credential-helper-go v0.0.0-20240531061116-25d7df71cdb6/go.mod h1:n8mVwofIoRWjWa+0p/kfKjGo9bHGQb6zfcJuO+Kob6o=
5-
github.com/EngFlow/credential-helper-go v0.0.0-20250604061407-6ba182beab5f h1:NsavghVUSYa9BDdOYL6xY1C38a/QbZXMdo7K0966QJI=
6-
github.com/EngFlow/credential-helper-go v0.0.0-20250604061407-6ba182beab5f/go.mod h1:W0JnIe1LV1OEMQDUYd+lhyPGGvO352wGEdEqjaW62Lg=
7-
github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
8-
github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
9-
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
10-
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
1+
github.com/EngFlow/credential-helper-go v0.0.0-20260320063250-1f92d5f713f4 h1:tstz2huO4hSwbdiLCxpxPVt+mKMzCaPRzu5jdzGTkH8=
2+
github.com/EngFlow/credential-helper-go v0.0.0-20260320063250-1f92d5f713f4/go.mod h1:DPlD9dzsQlpOI+zDoy9Khn+IX6WsBdHwRwDBqDSdWUA=
113
github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
124
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
13-
github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=
14-
github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=
15-
github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
16-
github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
5+
github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
6+
github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
177
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
188
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
19-
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
20-
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
21-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
22-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
23-
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
24-
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
25-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
26-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
9+
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
10+
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
11+
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
12+
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
13+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
14+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
2715
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2816
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2917
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -32,28 +20,18 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
3220
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
3321
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
3422
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
35-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
36-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
37-
github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
38-
github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
23+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
24+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
3925
github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
4026
github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
41-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
42-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
4327
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
4428
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
45-
github.com/zalando/go-keyring v0.2.5 h1:Bc2HHpjALryKD62ppdEzaFG6VxL6Bc+5v0LYpN8Lba8=
46-
github.com/zalando/go-keyring v0.2.5/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=
47-
github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
48-
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
49-
golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
50-
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
51-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
52-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
53-
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
54-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
55-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
56-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
29+
github.com/zalando/go-keyring v0.2.8 h1:6sD/Ucpl7jNq10rM2pgqTs0sZ9V3qMrqfIIy5YPccHs=
30+
github.com/zalando/go-keyring v0.2.8/go.mod h1:tsMo+VpRq5NGyKfxoBVjCuMrG47yj8cmakZDO5QGii0=
31+
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
32+
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
33+
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
34+
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
5735
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5836
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5937
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎platform/linux_x64/cc_toolchain_config.bzl‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
"""A Starlark cc_toolchain configuration rule"""
1616

17+
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
1718
load(
1819
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
1920
"action_config",
@@ -26,7 +27,8 @@ load(
2627
"variable_with_value",
2728
"with_feature_set",
2829
)
29-
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
30+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
31+
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
3032

3133
def layering_check_features(compiler):
3234
if compiler != "clang":
@@ -1273,28 +1275,28 @@ def _impl(ctx):
12731275
cc_toolchain_config = rule(
12741276
implementation = _impl,
12751277
attrs = {
1276-
"cpu": attr.string(mandatory = True),
1277-
"compiler": attr.string(mandatory = True),
1278-
"toolchain_identifier": attr.string(mandatory = True),
1279-
"host_system_name": attr.string(mandatory = True),
1280-
"target_system_name": attr.string(mandatory = True),
1281-
"target_libc": attr.string(mandatory = True),
1282-
"abi_version": attr.string(mandatory = True),
12831278
"abi_libc_version": attr.string(mandatory = True),
1284-
"cxx_builtin_include_directories": attr.string_list(),
1285-
"tool_paths": attr.string_dict(),
1279+
"abi_version": attr.string(mandatory = True),
1280+
"builtin_sysroot": attr.string(),
12861281
"compile_flags": attr.string_list(),
1287-
"dbg_compile_flags": attr.string_list(),
1288-
"opt_compile_flags": attr.string_list(),
1282+
"compiler": attr.string(mandatory = True),
1283+
"coverage_compile_flags": attr.string_list(),
1284+
"coverage_link_flags": attr.string_list(),
1285+
"cpu": attr.string(mandatory = True),
1286+
"cxx_builtin_include_directories": attr.string_list(),
12891287
"cxx_flags": attr.string_list(),
1288+
"dbg_compile_flags": attr.string_list(),
1289+
"host_system_name": attr.string(mandatory = True),
12901290
"link_flags": attr.string_list(),
12911291
"link_libs": attr.string_list(),
1292+
"opt_compile_flags": attr.string_list(),
12921293
"opt_link_flags": attr.string_list(),
1293-
"unfiltered_compile_flags": attr.string_list(),
1294-
"coverage_compile_flags": attr.string_list(),
1295-
"coverage_link_flags": attr.string_list(),
12961294
"supports_start_end_lib": attr.bool(),
1297-
"builtin_sysroot": attr.string(),
1295+
"target_libc": attr.string(mandatory = True),
1296+
"target_system_name": attr.string(mandatory = True),
1297+
"tool_paths": attr.string_dict(),
1298+
"toolchain_identifier": attr.string(mandatory = True),
1299+
"unfiltered_compile_flags": attr.string_list(),
12981300
},
12991301
provides = [CcToolchainConfigInfo],
13001302
)

‎platform/windows_x64/windows_cc_toolchain_config.bzl‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
"""A Starlark cc_toolchain configuration rule for Windows"""
1616

17+
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
1718
load(
1819
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
1920
"action_config",
@@ -28,7 +29,8 @@ load(
2829
"variable_with_value",
2930
"with_feature_set",
3031
)
31-
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
32+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
33+
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
3234

3335
all_compile_actions = [
3436
ACTION_NAMES.c_compile,
@@ -1394,29 +1396,29 @@ def _impl(ctx):
13941396
cc_toolchain_config = rule(
13951397
implementation = _impl,
13961398
attrs = {
1397-
"cpu": attr.string(mandatory = True),
1398-
"compiler": attr.string(),
1399-
"toolchain_identifier": attr.string(),
1400-
"host_system_name": attr.string(),
1401-
"target_system_name": attr.string(),
1402-
"target_libc": attr.string(),
1403-
"abi_version": attr.string(),
14041399
"abi_libc_version": attr.string(),
1405-
"tool_paths": attr.string_dict(),
1406-
"cxx_builtin_include_directories": attr.string_list(),
1400+
"abi_version": attr.string(),
14071401
"archiver_flags": attr.string_list(default = []),
1402+
"compiler": attr.string(),
1403+
"cpu": attr.string(mandatory = True),
1404+
"cxx_builtin_include_directories": attr.string_list(),
1405+
"dbg_mode_debug_flag": attr.string(),
14081406
"default_link_flags": attr.string_list(default = []),
1409-
"msvc_env_tmp": attr.string(default = "msvc_not_found"),
1410-
"msvc_env_path": attr.string(default = "msvc_not_found"),
1407+
"fastbuild_mode_debug_flag": attr.string(),
1408+
"host_system_name": attr.string(),
1409+
"msvc_cl_path": attr.string(default = "vc_installation_error.bat"),
14111410
"msvc_env_include": attr.string(default = "msvc_not_found"),
14121411
"msvc_env_lib": attr.string(default = "msvc_not_found"),
1413-
"msvc_cl_path": attr.string(default = "vc_installation_error.bat"),
1414-
"msvc_ml_path": attr.string(default = "vc_installation_error.bat"),
1415-
"msvc_link_path": attr.string(default = "vc_installation_error.bat"),
1412+
"msvc_env_path": attr.string(default = "msvc_not_found"),
1413+
"msvc_env_tmp": attr.string(default = "msvc_not_found"),
14161414
"msvc_lib_path": attr.string(default = "vc_installation_error.bat"),
1417-
"dbg_mode_debug_flag": attr.string(),
1418-
"fastbuild_mode_debug_flag": attr.string(),
1415+
"msvc_link_path": attr.string(default = "vc_installation_error.bat"),
1416+
"msvc_ml_path": attr.string(default = "vc_installation_error.bat"),
1417+
"target_libc": attr.string(),
1418+
"target_system_name": attr.string(),
14191419
"tool_bin_path": attr.string(default = "not_found"),
1420+
"tool_paths": attr.string_dict(),
1421+
"toolchain_identifier": attr.string(),
14201422
},
14211423
provides = [CcToolchainConfigInfo],
14221424
)

0 commit comments

Comments
 (0)