Skip to content

Commit

Permalink
build: force old timer behavior (#4620)
Browse files Browse the repository at this point in the history
Until golang/go#69312 is resolved, force the
old timer behavior by specifying an older go version in the go.mod file.

Fixes #4606
  • Loading branch information
oncilla authored Sep 17, 2024
1 parent 24ec39d commit f16cdd6
Show file tree
Hide file tree
Showing 10 changed files with 222 additions and 119 deletions.
6 changes: 3 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ steps:
- ./scion.sh run
- tools/await-connectivity
- ./bin/scion_integration || ( echo "^^^ +++" && false )
- ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration || ( echo "^^^ +++" && false )
plugins: &scion-run-hooks
- scionproto/metahook#v0.3.0:
pre-command: .buildkite/cleanup-leftovers.sh
Expand All @@ -142,7 +142,7 @@ steps:
- ./scion.sh topology -c topology/default-no-peers.topo
- ./scion.sh run
- tools/await-connectivity
- ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration || ( echo "^^^ +++" && false )
- ./tools/integration/revocation_test.sh
plugins: *scion-run-hooks
artifact_paths: *scion-run-artifact-paths
Expand All @@ -158,7 +158,7 @@ steps:
- ./scion.sh run
- tools/await-connectivity
- echo "--- run tests"
- ./bin/end2end_integration -d --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration -d || ( echo "^^^ +++" && false )
plugins: *scion-run-hooks
artifact_paths: *scion-run-artifact-paths
timeout_in_minutes: 15
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ go_rules_dependencies()

go_register_toolchains(
nogo = "@//:nogo",
version = "1.23.0",
version = "1.22.7",
)

# Gazelle
Expand Down Expand Up @@ -265,7 +265,7 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")

rules_js_dependencies()

load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")

nodejs_register_toolchains(
name = "nodejs",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@ require (
modernc.org/token v1.1.0 // indirect
)

go 1.23.0
go 1.22.7

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/build/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/telemetry/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/text/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/rsc.io/markdown/LICENSE

This file was deleted.

Loading

0 comments on commit f16cdd6

Please sign in to comment.