Skip to content

Commit 66830b0

Browse files
authored
Merge pull request #430 from Shopify/get-rid-of-vendored-packages
Get rid of vendored packages
2 parents 9ac8861 + fb0ca17 commit 66830b0

1,088 files changed

Lines changed: 17 additions & 553562 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/tests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ on:
66
- main
77
pull_request:
88

9+
# Prevent Go from auto-activating vendor mode when a stale vendor/ directory
10+
# exists in the workspace. Actions/checkout does not always remove previously
11+
# tracked files that were deleted in a later commit, so a checkout of a commit
12+
# that removed vendor/ may still find the directory on disk, causing
13+
# "inconsistent vendoring" build failures.
14+
env:
15+
GOFLAGS: "-mod=mod"
16+
917
jobs:
1018
gh-285:
1119
strategy:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.
99
- Align default zerolog log level with logrus (info vs trace)
1010
- Introduce slog handler wrapper around our Logger interface and use it with BinlogStreamer
1111

12+
### Removed
13+
14+
- Vendored packages are removed in favour of normal `go mod`
15+
1216
## [1.3.0 - 2026-04-08]
1317

1418
### Changed

test/helpers/ghostferry_helper.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,16 @@ def compile_binary
142142
return if File.exist?(@compiled_binary_path)
143143

144144
@logger.debug("compiling test binary to #{@compiled_binary_path}")
145-
rc = system(
145+
146+
# Use capture2e so that go build stderr is included in the raised error
147+
# message rather than being swallowed by the test runner.
148+
output, status = Open3.capture2e(
146149
"go", "build",
147150
"-o", @compiled_binary_path,
148151
@main_path
149152
)
150153

151-
raise "could not compile ghostferry" unless rc
154+
raise "could not compile ghostferry:\n#{output}" unless status.success?
152155
end
153156

154157
def start_server

vendor/filippo.io/edwards25519/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

vendor/filippo.io/edwards25519/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

vendor/filippo.io/edwards25519/doc.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)