From 5725b01b7d81c24fddd56ffc6953d206db516d18 Mon Sep 17 00:00:00 2001 From: Safeer Jiwan Date: Mon, 7 Oct 2024 15:10:07 -0700 Subject: [PATCH] cleanup --- .github/workflows/ci.yml | 25 ++----------------------- smoketest/echo/echo.go | 14 -------------- smoketest/echo/ftl.toml | 2 -- smoketest/echo/go.mod | 5 ----- smoketest/echo/go.sum | 0 5 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 smoketest/echo/echo.go delete mode 100644 smoketest/echo/ftl.toml delete mode 100644 smoketest/echo/go.mod delete mode 100644 smoketest/echo/go.sum diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43f78f4044..805e0cdf2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -380,8 +380,6 @@ jobs: fetch-depth: 0 fetch-tags: true - name: Get latest release tag - # TODO switch to: latest_release=$(git tag --sort=-v:refname | grep -v v1 | head -n 1) - # latest_release=$(git rev-parse HEAD^) run: | latest_release=$(git tag --sort=-v:refname | grep -v v1 | head -n 1) echo "Latest release: $latest_release" @@ -410,33 +408,14 @@ jobs: - name: Download Go Modules run: go mod download - name: Smoke Test Upgrade Path + # There's a chicken-and-egg here since the smoketest tag isn't in the last release, + # update -tags integration to -tags smoketest when released. run: | set -euo pipefail echo "Replacing current exemplar with latest released exemplar" rm -r ./smoketest && mv ./tmpsmoketest/smoketest ./smoketest && rm -r ./tmpsmoketest echo "Running smoke test" go test -v -tags integration -run '^Test' ./smoketest - # run: | - # test_files=$(git grep -l '^//go:build smoketest' | xargs -I {} dirname {} || true) - # echo "Smoke test files: $test_files" - - # if [ -z "$test_files" ]; then - # echo "No smoke test files found." - # exit 0 # Exit gracefully if no smoke test files are found - # fi - - # for file in $test_files; do - # echo "Running smoke tests in $file" - # go test -v -tags smoketest -run '^Test' "$file" - # done - # run: | - # set -euo pipefail - # # shellcheck disable=SC2046 - # test_files=$(git grep -l '^//go:build smoketest' | xargs -I {} dirname ./{}) - # echo "smoke test test_files: $test_files" - # for file in $test_files; do - # go test -v -tags smoketest -run '^Test' "$file" - # done - name: Archive Report uses: actions/upload-artifact@v4 if: always() diff --git a/smoketest/echo/echo.go b/smoketest/echo/echo.go deleted file mode 100644 index 6ce84c47b6..0000000000 --- a/smoketest/echo/echo.go +++ /dev/null @@ -1,14 +0,0 @@ -// This is the echo module. -package echo - -import ( - "context" - "fmt" -) - -// Echo returns a greeting with the current time. -// -//ftl:verb export -func Echo(ctx context.Context, req string) (string, error) { - return fmt.Sprintf("Hello, %s!!!", req), nil -} diff --git a/smoketest/echo/ftl.toml b/smoketest/echo/ftl.toml deleted file mode 100644 index 72ce292aa2..0000000000 --- a/smoketest/echo/ftl.toml +++ /dev/null @@ -1,2 +0,0 @@ -module = "echo" -language = "go" diff --git a/smoketest/echo/go.mod b/smoketest/echo/go.mod deleted file mode 100644 index 8980e7a111..0000000000 --- a/smoketest/echo/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module ftl/echo - -go 1.23.0 - -replace github.com/TBD54566975/ftl => ../.. diff --git a/smoketest/echo/go.sum b/smoketest/echo/go.sum deleted file mode 100644 index e69de29bb2..0000000000