From d919aee1217095a574dc7121860d31f35a952d23 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Sun, 14 Jun 2026 13:08:00 +0100 Subject: [PATCH 1/3] feat: push tests down - test more at go level Signed-off-by: Giles Cope --- ...omment-and-whitespace-before-version.earth | 19 ++++ .../version/comment-then-version.earth | 6 + .../invalid-feature-flag-override.earth | 1 + .../version/invalid-format-version.earth | 1 + .../version/invalid-major-version.earth | 1 + .../version/invalid-minor-version.earth | 1 + .../version/invalid-patch-version.earth | 1 + .../version/multi-line-with-args.earth | 7 ++ .../version/multi-line-with-args2.earth | 7 ++ .../version/multi-line-with-comment.earth | 6 + .../version/multi-line-with-comment2.earth | 6 + .../version/multi-line-with-comment3.earth | 6 + .../version/multi-line-with-comment4.earth | 7 ++ .../multi-line-with-empty-newline.earth | 8 ++ ast/testdata/version/multi-line.earth | 6 + .../version/single-line-with-args.earth | 5 + .../version/single-line-with-comment.earth | 5 + ast/testdata/version/single-line.earth | 5 + .../version/version-only-import.earth | 6 + ast/testdata/version/version-only.earth | 1 + .../version/whitespace-then-version.earth | 9 ++ ast/version_test.go | 104 ++++++++++++++++++ 22 files changed, 218 insertions(+) create mode 100644 ast/testdata/version/comment-and-whitespace-before-version.earth create mode 100644 ast/testdata/version/comment-then-version.earth create mode 100644 ast/testdata/version/invalid-feature-flag-override.earth create mode 100644 ast/testdata/version/invalid-format-version.earth create mode 100644 ast/testdata/version/invalid-major-version.earth create mode 100644 ast/testdata/version/invalid-minor-version.earth create mode 100644 ast/testdata/version/invalid-patch-version.earth create mode 100644 ast/testdata/version/multi-line-with-args.earth create mode 100644 ast/testdata/version/multi-line-with-args2.earth create mode 100644 ast/testdata/version/multi-line-with-comment.earth create mode 100644 ast/testdata/version/multi-line-with-comment2.earth create mode 100644 ast/testdata/version/multi-line-with-comment3.earth create mode 100644 ast/testdata/version/multi-line-with-comment4.earth create mode 100644 ast/testdata/version/multi-line-with-empty-newline.earth create mode 100644 ast/testdata/version/multi-line.earth create mode 100644 ast/testdata/version/single-line-with-args.earth create mode 100644 ast/testdata/version/single-line-with-comment.earth create mode 100644 ast/testdata/version/single-line.earth create mode 100644 ast/testdata/version/version-only-import.earth create mode 100644 ast/testdata/version/version-only.earth create mode 100644 ast/testdata/version/whitespace-then-version.earth diff --git a/ast/testdata/version/comment-and-whitespace-before-version.earth b/ast/testdata/version/comment-and-whitespace-before-version.earth new file mode 100644 index 0000000000..7ee3e1fa53 --- /dev/null +++ b/ast/testdata/version/comment-and-whitespace-before-version.earth @@ -0,0 +1,19 @@ + + + + +# welcome to my + +# spacious + + + +# test +VERSION 0.8 + + + + +test: + FROM alpine:3.18 + RUN echo "pass" diff --git a/ast/testdata/version/comment-then-version.earth b/ast/testdata/version/comment-then-version.earth new file mode 100644 index 0000000000..2869d4d952 --- /dev/null +++ b/ast/testdata/version/comment-then-version.earth @@ -0,0 +1,6 @@ +# test a comment before +VERSION 0.8 + +test: + FROM alpine:3.18 + RUN echo "pass" diff --git a/ast/testdata/version/invalid-feature-flag-override.earth b/ast/testdata/version/invalid-feature-flag-override.earth new file mode 100644 index 0000000000..855b1d28f5 --- /dev/null +++ b/ast/testdata/version/invalid-feature-flag-override.earth @@ -0,0 +1 @@ +VERSION --referenced-save-only=false 0.6 diff --git a/ast/testdata/version/invalid-format-version.earth b/ast/testdata/version/invalid-format-version.earth new file mode 100644 index 0000000000..02a4055325 --- /dev/null +++ b/ast/testdata/version/invalid-format-version.earth @@ -0,0 +1 @@ +VERSION 0.8 --try # we should consider making this format valid, but for now it isn't and we should test it diff --git a/ast/testdata/version/invalid-major-version.earth b/ast/testdata/version/invalid-major-version.earth new file mode 100644 index 0000000000..72c1401df4 --- /dev/null +++ b/ast/testdata/version/invalid-major-version.earth @@ -0,0 +1 @@ +VERSION 1.0 # yay when this test fails! diff --git a/ast/testdata/version/invalid-minor-version.earth b/ast/testdata/version/invalid-minor-version.earth new file mode 100644 index 0000000000..d4ddec31b3 --- /dev/null +++ b/ast/testdata/version/invalid-minor-version.earth @@ -0,0 +1 @@ +VERSION 0.4 # versioning was only added since 0.5 diff --git a/ast/testdata/version/invalid-patch-version.earth b/ast/testdata/version/invalid-patch-version.earth new file mode 100644 index 0000000000..331927853e --- /dev/null +++ b/ast/testdata/version/invalid-patch-version.earth @@ -0,0 +1 @@ +VERSION 0.5.1 # patch version is not supported for Earthfile version diff --git a/ast/testdata/version/multi-line-with-args.earth b/ast/testdata/version/multi-line-with-args.earth new file mode 100644 index 0000000000..210ab4b297 --- /dev/null +++ b/ast/testdata/version/multi-line-with-args.earth @@ -0,0 +1,7 @@ +VERSION \ #with a comment that doesn't have a space after the hash. + --try \ + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-args2.earth b/ast/testdata/version/multi-line-with-args2.earth new file mode 100644 index 0000000000..d628f0aa22 --- /dev/null +++ b/ast/testdata/version/multi-line-with-args2.earth @@ -0,0 +1,7 @@ +VERSION \ # This is an example of a user that wants to comment out a single feature, lines with only comments should not count towards the continued line + #--try \ + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment.earth b/ast/testdata/version/multi-line-with-comment.earth new file mode 100644 index 0000000000..4acb7de9ba --- /dev/null +++ b/ast/testdata/version/multi-line-with-comment.earth @@ -0,0 +1,6 @@ +VERSION \ #with a comment that doesn't have a space after the hash. + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment2.earth b/ast/testdata/version/multi-line-with-comment2.earth new file mode 100644 index 0000000000..d4e022d0e9 --- /dev/null +++ b/ast/testdata/version/multi-line-with-comment2.earth @@ -0,0 +1,6 @@ +VERSION \ # with a comment + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment3.earth b/ast/testdata/version/multi-line-with-comment3.earth new file mode 100644 index 0000000000..35cd42cb67 --- /dev/null +++ b/ast/testdata/version/multi-line-with-comment3.earth @@ -0,0 +1,6 @@ +VERSION \ ########################## + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment4.earth b/ast/testdata/version/multi-line-with-comment4.earth new file mode 100644 index 0000000000..e0350f0c58 --- /dev/null +++ b/ast/testdata/version/multi-line-with-comment4.earth @@ -0,0 +1,7 @@ +VERSION \ + # don't count this as the continued line + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-empty-newline.earth b/ast/testdata/version/multi-line-with-empty-newline.earth new file mode 100644 index 0000000000..4df55b3dc6 --- /dev/null +++ b/ast/testdata/version/multi-line-with-empty-newline.earth @@ -0,0 +1,8 @@ +VERSION \ + + + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/multi-line.earth b/ast/testdata/version/multi-line.earth new file mode 100644 index 0000000000..c374894193 --- /dev/null +++ b/ast/testdata/version/multi-line.earth @@ -0,0 +1,6 @@ +VERSION \ + 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/single-line-with-args.earth b/ast/testdata/version/single-line-with-args.earth new file mode 100644 index 0000000000..92f4aca217 --- /dev/null +++ b/ast/testdata/version/single-line-with-args.earth @@ -0,0 +1,5 @@ +VERSION --try 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/single-line-with-comment.earth b/ast/testdata/version/single-line-with-comment.earth new file mode 100644 index 0000000000..6b3721fc5f --- /dev/null +++ b/ast/testdata/version/single-line-with-comment.earth @@ -0,0 +1,5 @@ +VERSION 0.8 # make sure a comment here works + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/single-line.earth b/ast/testdata/version/single-line.earth new file mode 100644 index 0000000000..cee0c29bac --- /dev/null +++ b/ast/testdata/version/single-line.earth @@ -0,0 +1,5 @@ +VERSION 0.8 + +FROM alpine:3.18 +test: + RUN echo "pass" diff --git a/ast/testdata/version/version-only-import.earth b/ast/testdata/version/version-only-import.earth new file mode 100644 index 0000000000..f123949b1d --- /dev/null +++ b/ast/testdata/version/version-only-import.earth @@ -0,0 +1,6 @@ +VERSION 0.8 +IMPORT ./subdir AS empty-earthfile-only-containing-a-version + +test: + FROM alpine:3.18 + RUN echo "pass" diff --git a/ast/testdata/version/version-only.earth b/ast/testdata/version/version-only.earth new file mode 100644 index 0000000000..a8078d524a --- /dev/null +++ b/ast/testdata/version/version-only.earth @@ -0,0 +1 @@ +VERSION 0.8 diff --git a/ast/testdata/version/whitespace-then-version.earth b/ast/testdata/version/whitespace-then-version.earth new file mode 100644 index 0000000000..9ad7674de0 --- /dev/null +++ b/ast/testdata/version/whitespace-then-version.earth @@ -0,0 +1,9 @@ + + + +VERSION 0.8 + + +test: + FROM alpine:3.18 + RUN echo "pass" diff --git a/ast/version_test.go b/ast/version_test.go index 77de57c498..ade0495cd9 100644 --- a/ast/version_test.go +++ b/ast/version_test.go @@ -1,10 +1,12 @@ package ast_test import ( + "path/filepath" "strings" "testing" "github.com/EarthBuild/earthbuild/ast" + "github.com/EarthBuild/earthbuild/features" "github.com/stretchr/testify/require" ) @@ -19,3 +21,105 @@ func TestParseVersion(t *testing.T) { r.Equal("0.6", ver.Args[0]) r.Nil(ver.SourceLocation) } + +func TestVersionFixtures(t *testing.T) { + t.Parallel() + + validFixtures := []string{ + "single-line.earth", + "single-line-with-args.earth", + "single-line-with-comment.earth", + "multi-line.earth", + "multi-line-with-comment.earth", + "multi-line-with-comment2.earth", + "multi-line-with-comment3.earth", + "multi-line-with-comment4.earth", + "multi-line-with-args.earth", + "multi-line-with-args2.earth", + "multi-line-with-empty-newline.earth", + "version-only-import.earth", + "version-only.earth", + "comment-and-whitespace-before-version.earth", + "whitespace-then-version.earth", + } + + for _, fixture := range validFixtures { + t.Run(fixture, func(t *testing.T) { + t.Parallel() + + ef, err := ast.ParseOpts(ast.FromPath(filepath.Join("testdata", "version", fixture))) + require.NoError(t, err) + require.NotNil(t, ef.Version) + + ftrs, _, err := features.Get(ef.Version) + require.NoError(t, err) + _, err = ftrs.ProcessFlags() + require.NoError(t, err) + }) + } +} + +func TestInvalidVersionFixtures(t *testing.T) { + t.Parallel() + + tests := []struct { + fixture string + wantErr string + parseVersion bool + }{ + { + fixture: "invalid-major-version.earth", + wantErr: "Earthfile version is invalid, supported versions are 0.6, 0.7, or 0.8", + }, + { + fixture: "invalid-minor-version.earth", + wantErr: "Earthfile version is invalid, supported versions are 0.6, 0.7, or 0.8", + }, + { + fixture: "invalid-patch-version.earth", + wantErr: "unexpected VERSION arguments; should be VERSION [flags] .", + parseVersion: true, + }, + { + fixture: "invalid-format-version.earth", + wantErr: "unexpected VERSION arguments; should be VERSION [flags] .", + parseVersion: true, + }, + { + fixture: "invalid-feature-flag-override.earth", + wantErr: "bool flag `--referenced-save-only' cannot have an argument", + parseVersion: true, + }, + } + + for _, test := range tests { + t.Run(test.fixture, func(t *testing.T) { + t.Parallel() + + path := filepath.Join("testdata", "version", test.fixture) + if test.parseVersion { + version, err := ast.ParseVersion(path, false) + require.NoError(t, err) + + _, _, err = features.Get(version) + require.Error(t, err) + require.ErrorContains(t, err, test.wantErr) + + return + } + + ef, err := ast.ParseOpts(ast.FromPath(path)) + if err == nil { + ftrs, _, ftrsErr := features.Get(ef.Version) + if ftrsErr == nil { + _, ftrsErr = ftrs.ProcessFlags() + } + + err = ftrsErr + } + + require.Error(t, err) + require.ErrorContains(t, err, test.wantErr) + }) + } +} From b27afc66a82589cb8657b61b281b3dc47cf7441c Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Sun, 14 Jun 2026 13:23:01 +0100 Subject: [PATCH 2/3] feat: remove the old integration tests Signed-off-by: Giles Cope --- tests/version/Earthfile | 78 ++----------------- ...omment-and-whitespace-before-version.earth | 19 ----- tests/version/comment-then-version.earth | 6 -- .../invalid-feature-flag-override.earth | 1 - tests/version/invalid-major-version.earth | 1 - tests/version/invalid-minor-version.earth | 1 - tests/version/invalid-patch-version.earth | 1 - tests/version/multi-line-with-args.earth | 7 -- tests/version/multi-line-with-args2.earth | 7 -- tests/version/multi-line-with-comment.earth | 6 -- tests/version/multi-line-with-comment2.earth | 6 -- tests/version/multi-line-with-comment3.earth | 6 -- tests/version/multi-line-with-comment4.earth | 7 -- .../multi-line-with-empty-newline.earth | 8 -- tests/version/multi-line.earth | 6 -- tests/version/single-line-with-args.earth | 5 -- tests/version/single-line-with-comment.earth | 5 -- tests/version/version-only.earth | 1 - tests/version/whitespace-then-version.earth | 9 --- 19 files changed, 5 insertions(+), 175 deletions(-) delete mode 100644 tests/version/comment-and-whitespace-before-version.earth delete mode 100644 tests/version/comment-then-version.earth delete mode 100644 tests/version/invalid-feature-flag-override.earth delete mode 100644 tests/version/invalid-major-version.earth delete mode 100644 tests/version/invalid-minor-version.earth delete mode 100644 tests/version/invalid-patch-version.earth delete mode 100644 tests/version/multi-line-with-args.earth delete mode 100644 tests/version/multi-line-with-args2.earth delete mode 100644 tests/version/multi-line-with-comment.earth delete mode 100644 tests/version/multi-line-with-comment2.earth delete mode 100644 tests/version/multi-line-with-comment3.earth delete mode 100644 tests/version/multi-line-with-comment4.earth delete mode 100644 tests/version/multi-line-with-empty-newline.earth delete mode 100644 tests/version/multi-line.earth delete mode 100644 tests/version/single-line-with-args.earth delete mode 100644 tests/version/single-line-with-comment.earth delete mode 100644 tests/version/version-only.earth delete mode 100644 tests/version/whitespace-then-version.earth diff --git a/tests/version/Earthfile b/tests/version/Earthfile index 9d30e79289..1882877823 100644 --- a/tests/version/Earthfile +++ b/tests/version/Earthfile @@ -5,89 +5,21 @@ IMPORT .. AS tests WORKDIR /test -test-single-line: +test-cli-smoke: + # Detailed VERSION syntax coverage lives in ast/version_test.go. Keep one + # successful build, one version-only import, and one invalid-version CLI + # smoke here so the full command path still gets exercised. DO --pass-args +RUN_EARTHLY_ARGS --earthfile=single-line.earth --target=+test -test-single-line-with-args: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=single-line-with-args.earth --target=+test - -test-single-line-with-comment: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=single-line-with-comment.earth --target=+test - -test-multi-line: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line.earth --target=+test - -test-multi-line-with-comment: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-comment.earth --target=+test - -test-multi-line-with-comment2: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-comment2.earth --target=+test - -test-multi-line-with-comment3: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-comment3.earth --target=+test - -test-multi-line-with-comment4: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-comment4.earth --target=+test - -test-multi-line-with-args: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-args.earth --target=+test - -test-multi-line-with-args2: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-args2.earth --target=+test - -test-multi-line-with-newline: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=multi-line-with-empty-newline.earth --target=+test - -test-no-feature-flag-overrides: - DO --pass-args +RUN_EARTHLY_ARGS --should_fail=true --earthfile=invalid-feature-flag-override.earth --target=+test --output_contains="bool flag .--referenced-save-only. cannot have an argument" - -test-version-only-import: RUN mkdir subdir RUN echo "VERSION 0.8" > subdir/Earthfile DO --pass-args +RUN_EARTHLY_ARGS --earthfile=version-only-import.earth --target=+test -# test-version-only-without-newline tests that earthly will still work with non-POSIX text files -test-version-only-without-newline: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=version-only.earth --target=+base - RUN test "$(cat Earthfile | wc -l)" = "0" # check Earthfile doesn't contain a newline - -test-comment-and-whitespace-before-version: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=comment-and-whitespace-before-version.earth --target=+test - -test-whitespace-then-version: - DO --pass-args +RUN_EARTHLY_ARGS --earthfile=whitespace-then-version.earth --target=+test - -test-invalid-versions: - DO --pass-args +RUN_EARTHLY_ARGS --should_fail=true --earthfile=invalid-major-version.earth --target=+base - RUN acbgrep 'Earthfile version is invalid, supported versions are 0.6, 0.7, or 0.8' earthly.output - - DO --pass-args +RUN_EARTHLY_ARGS --should_fail=true --earthfile=invalid-minor-version.earth --target=+base - RUN acbgrep 'Earthfile version is invalid, supported versions are 0.6, 0.7, or 0.8' earthly.output - - DO --pass-args +RUN_EARTHLY_ARGS --should_fail=true --earthfile=invalid-patch-version.earth --target=+base - RUN acbgrep 'unexpected VERSION arguments; should be VERSION \[flags\] .' earthly.output - DO --pass-args +RUN_EARTHLY_ARGS --should_fail=true --earthfile=invalid-format-version.earth --target=+base RUN acbgrep 'unexpected VERSION arguments; should be VERSION \[flags\] .' earthly.output test-all: - BUILD +test-single-line - BUILD +test-single-line-with-args - BUILD +test-single-line-with-comment - BUILD +test-multi-line - BUILD +test-multi-line-with-comment - BUILD +test-multi-line-with-comment2 - BUILD +test-multi-line-with-comment3 - BUILD +test-multi-line-with-comment4 - BUILD +test-multi-line-with-args - BUILD +test-multi-line-with-args2 - BUILD +test-multi-line-with-newline - BUILD +test-version-only-without-newline - BUILD +test-comment-and-whitespace-before-version - BUILD +test-whitespace-then-version - BUILD +test-version-only-import - BUILD +test-invalid-versions - BUILD +test-no-feature-flag-overrides + BUILD +test-cli-smoke RUN_EARTHLY_ARGS: FUNCTION diff --git a/tests/version/comment-and-whitespace-before-version.earth b/tests/version/comment-and-whitespace-before-version.earth deleted file mode 100644 index 28ed680ce9..0000000000 --- a/tests/version/comment-and-whitespace-before-version.earth +++ /dev/null @@ -1,19 +0,0 @@ - - - - -# welcome to my - -# spacious - - - -# test -VERSION 0.8 - - - - -test: - FROM alpine:3.24.0 - RUN echo "pass" diff --git a/tests/version/comment-then-version.earth b/tests/version/comment-then-version.earth deleted file mode 100644 index dbef1e5e95..0000000000 --- a/tests/version/comment-then-version.earth +++ /dev/null @@ -1,6 +0,0 @@ -# test a comment before -VERSION 0.8 - -test: - FROM alpine:3.24.0 - RUN echo "pass" diff --git a/tests/version/invalid-feature-flag-override.earth b/tests/version/invalid-feature-flag-override.earth deleted file mode 100644 index 855b1d28f5..0000000000 --- a/tests/version/invalid-feature-flag-override.earth +++ /dev/null @@ -1 +0,0 @@ -VERSION --referenced-save-only=false 0.6 diff --git a/tests/version/invalid-major-version.earth b/tests/version/invalid-major-version.earth deleted file mode 100644 index 72c1401df4..0000000000 --- a/tests/version/invalid-major-version.earth +++ /dev/null @@ -1 +0,0 @@ -VERSION 1.0 # yay when this test fails! diff --git a/tests/version/invalid-minor-version.earth b/tests/version/invalid-minor-version.earth deleted file mode 100644 index d4ddec31b3..0000000000 --- a/tests/version/invalid-minor-version.earth +++ /dev/null @@ -1 +0,0 @@ -VERSION 0.4 # versioning was only added since 0.5 diff --git a/tests/version/invalid-patch-version.earth b/tests/version/invalid-patch-version.earth deleted file mode 100644 index 331927853e..0000000000 --- a/tests/version/invalid-patch-version.earth +++ /dev/null @@ -1 +0,0 @@ -VERSION 0.5.1 # patch version is not supported for Earthfile version diff --git a/tests/version/multi-line-with-args.earth b/tests/version/multi-line-with-args.earth deleted file mode 100644 index cc3226c780..0000000000 --- a/tests/version/multi-line-with-args.earth +++ /dev/null @@ -1,7 +0,0 @@ -VERSION \ #with a comment that doesn't have a space after the hash. - --try \ - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-args2.earth b/tests/version/multi-line-with-args2.earth deleted file mode 100644 index 982cc967c7..0000000000 --- a/tests/version/multi-line-with-args2.earth +++ /dev/null @@ -1,7 +0,0 @@ -VERSION \ # This is an example of a user that wants to comment out a single feature, lines with only comments should not count towards the continued line - #--try \ - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-comment.earth b/tests/version/multi-line-with-comment.earth deleted file mode 100644 index b2d7bc5e04..0000000000 --- a/tests/version/multi-line-with-comment.earth +++ /dev/null @@ -1,6 +0,0 @@ -VERSION \ #with a comment that doesn't have a space after the hash. - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-comment2.earth b/tests/version/multi-line-with-comment2.earth deleted file mode 100644 index 8a143ed514..0000000000 --- a/tests/version/multi-line-with-comment2.earth +++ /dev/null @@ -1,6 +0,0 @@ -VERSION \ # with a comment - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-comment3.earth b/tests/version/multi-line-with-comment3.earth deleted file mode 100644 index e634e79565..0000000000 --- a/tests/version/multi-line-with-comment3.earth +++ /dev/null @@ -1,6 +0,0 @@ -VERSION \ ########################## - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-comment4.earth b/tests/version/multi-line-with-comment4.earth deleted file mode 100644 index 09a16ee805..0000000000 --- a/tests/version/multi-line-with-comment4.earth +++ /dev/null @@ -1,7 +0,0 @@ -VERSION \ - # don't count this as the continued line - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line-with-empty-newline.earth b/tests/version/multi-line-with-empty-newline.earth deleted file mode 100644 index 53bade9c97..0000000000 --- a/tests/version/multi-line-with-empty-newline.earth +++ /dev/null @@ -1,8 +0,0 @@ -VERSION \ - - - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/multi-line.earth b/tests/version/multi-line.earth deleted file mode 100644 index 03197b41fd..0000000000 --- a/tests/version/multi-line.earth +++ /dev/null @@ -1,6 +0,0 @@ -VERSION \ - 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/single-line-with-args.earth b/tests/version/single-line-with-args.earth deleted file mode 100644 index b66b253ecf..0000000000 --- a/tests/version/single-line-with-args.earth +++ /dev/null @@ -1,5 +0,0 @@ -VERSION --try 0.8 - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/single-line-with-comment.earth b/tests/version/single-line-with-comment.earth deleted file mode 100644 index b626e45a34..0000000000 --- a/tests/version/single-line-with-comment.earth +++ /dev/null @@ -1,5 +0,0 @@ -VERSION 0.8 # make sure a comment here works - -FROM alpine:3.24.0 -test: - RUN echo "pass" diff --git a/tests/version/version-only.earth b/tests/version/version-only.earth deleted file mode 100644 index 06a75fdfd4..0000000000 --- a/tests/version/version-only.earth +++ /dev/null @@ -1 +0,0 @@ -VERSION 0.8 \ No newline at end of file diff --git a/tests/version/whitespace-then-version.earth b/tests/version/whitespace-then-version.earth deleted file mode 100644 index eed7e5afaa..0000000000 --- a/tests/version/whitespace-then-version.earth +++ /dev/null @@ -1,9 +0,0 @@ - - - -VERSION 0.8 - - -test: - FROM alpine:3.24.0 - RUN echo "pass" From 07570abf78303745f306bd75818c9d7bf1171449 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Wed, 1 Jul 2026 08:32:54 +0100 Subject: [PATCH 3/3] fix: reduce diff - shouldn't have rolled back this version Signed-off-by: Giles Cope --- .../version/comment-and-whitespace-before-version.earth | 2 +- ast/testdata/version/comment-then-version.earth | 2 +- ast/testdata/version/multi-line-with-args.earth | 2 +- ast/testdata/version/multi-line-with-args2.earth | 2 +- ast/testdata/version/multi-line-with-comment.earth | 2 +- ast/testdata/version/multi-line-with-comment2.earth | 2 +- ast/testdata/version/multi-line-with-comment3.earth | 2 +- ast/testdata/version/multi-line-with-comment4.earth | 2 +- ast/testdata/version/multi-line-with-empty-newline.earth | 2 +- ast/testdata/version/multi-line.earth | 2 +- ast/testdata/version/single-line-with-args.earth | 2 +- ast/testdata/version/single-line-with-comment.earth | 2 +- ast/testdata/version/single-line.earth | 2 +- ast/testdata/version/version-only-import.earth | 2 +- ast/testdata/version/whitespace-then-version.earth | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ast/testdata/version/comment-and-whitespace-before-version.earth b/ast/testdata/version/comment-and-whitespace-before-version.earth index 7ee3e1fa53..28ed680ce9 100644 --- a/ast/testdata/version/comment-and-whitespace-before-version.earth +++ b/ast/testdata/version/comment-and-whitespace-before-version.earth @@ -15,5 +15,5 @@ VERSION 0.8 test: - FROM alpine:3.18 + FROM alpine:3.24.0 RUN echo "pass" diff --git a/ast/testdata/version/comment-then-version.earth b/ast/testdata/version/comment-then-version.earth index 2869d4d952..dbef1e5e95 100644 --- a/ast/testdata/version/comment-then-version.earth +++ b/ast/testdata/version/comment-then-version.earth @@ -2,5 +2,5 @@ VERSION 0.8 test: - FROM alpine:3.18 + FROM alpine:3.24.0 RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-args.earth b/ast/testdata/version/multi-line-with-args.earth index 210ab4b297..cc3226c780 100644 --- a/ast/testdata/version/multi-line-with-args.earth +++ b/ast/testdata/version/multi-line-with-args.earth @@ -2,6 +2,6 @@ VERSION \ #with a comment that doesn't have a space after the hash. --try \ 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-args2.earth b/ast/testdata/version/multi-line-with-args2.earth index d628f0aa22..982cc967c7 100644 --- a/ast/testdata/version/multi-line-with-args2.earth +++ b/ast/testdata/version/multi-line-with-args2.earth @@ -2,6 +2,6 @@ VERSION \ # This is an example of a user that wants to comment out a single feat #--try \ 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment.earth b/ast/testdata/version/multi-line-with-comment.earth index 4acb7de9ba..b2d7bc5e04 100644 --- a/ast/testdata/version/multi-line-with-comment.earth +++ b/ast/testdata/version/multi-line-with-comment.earth @@ -1,6 +1,6 @@ VERSION \ #with a comment that doesn't have a space after the hash. 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment2.earth b/ast/testdata/version/multi-line-with-comment2.earth index d4e022d0e9..8a143ed514 100644 --- a/ast/testdata/version/multi-line-with-comment2.earth +++ b/ast/testdata/version/multi-line-with-comment2.earth @@ -1,6 +1,6 @@ VERSION \ # with a comment 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment3.earth b/ast/testdata/version/multi-line-with-comment3.earth index 35cd42cb67..e634e79565 100644 --- a/ast/testdata/version/multi-line-with-comment3.earth +++ b/ast/testdata/version/multi-line-with-comment3.earth @@ -1,6 +1,6 @@ VERSION \ ########################## 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-comment4.earth b/ast/testdata/version/multi-line-with-comment4.earth index e0350f0c58..09a16ee805 100644 --- a/ast/testdata/version/multi-line-with-comment4.earth +++ b/ast/testdata/version/multi-line-with-comment4.earth @@ -2,6 +2,6 @@ VERSION \ # don't count this as the continued line 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line-with-empty-newline.earth b/ast/testdata/version/multi-line-with-empty-newline.earth index 4df55b3dc6..53bade9c97 100644 --- a/ast/testdata/version/multi-line-with-empty-newline.earth +++ b/ast/testdata/version/multi-line-with-empty-newline.earth @@ -3,6 +3,6 @@ VERSION \ 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/multi-line.earth b/ast/testdata/version/multi-line.earth index c374894193..03197b41fd 100644 --- a/ast/testdata/version/multi-line.earth +++ b/ast/testdata/version/multi-line.earth @@ -1,6 +1,6 @@ VERSION \ 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/single-line-with-args.earth b/ast/testdata/version/single-line-with-args.earth index 92f4aca217..b66b253ecf 100644 --- a/ast/testdata/version/single-line-with-args.earth +++ b/ast/testdata/version/single-line-with-args.earth @@ -1,5 +1,5 @@ VERSION --try 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/single-line-with-comment.earth b/ast/testdata/version/single-line-with-comment.earth index 6b3721fc5f..b626e45a34 100644 --- a/ast/testdata/version/single-line-with-comment.earth +++ b/ast/testdata/version/single-line-with-comment.earth @@ -1,5 +1,5 @@ VERSION 0.8 # make sure a comment here works -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/single-line.earth b/ast/testdata/version/single-line.earth index cee0c29bac..9556194ce3 100644 --- a/ast/testdata/version/single-line.earth +++ b/ast/testdata/version/single-line.earth @@ -1,5 +1,5 @@ VERSION 0.8 -FROM alpine:3.18 +FROM alpine:3.24.0 test: RUN echo "pass" diff --git a/ast/testdata/version/version-only-import.earth b/ast/testdata/version/version-only-import.earth index f123949b1d..3ed1e5dac2 100644 --- a/ast/testdata/version/version-only-import.earth +++ b/ast/testdata/version/version-only-import.earth @@ -2,5 +2,5 @@ VERSION 0.8 IMPORT ./subdir AS empty-earthfile-only-containing-a-version test: - FROM alpine:3.18 + FROM alpine:3.24.0 RUN echo "pass" diff --git a/ast/testdata/version/whitespace-then-version.earth b/ast/testdata/version/whitespace-then-version.earth index 9ad7674de0..eed7e5afaa 100644 --- a/ast/testdata/version/whitespace-then-version.earth +++ b/ast/testdata/version/whitespace-then-version.earth @@ -5,5 +5,5 @@ VERSION 0.8 test: - FROM alpine:3.18 + FROM alpine:3.24.0 RUN echo "pass"