Fix test-readme (#50)

* Fix test-readme Signed-off-by: Friedrich Gonzalez <[email protected]> * Add error Signed-off-by: Friedrich Gonzalez <[email protected]> * :ry again Signed-off-by: Friedrich Gonzalez <[email protected]> * Fix test Signed-off-by: Friedrich Gonzalez <[email protected]> * Remove unneeded Signed-off-by: Friedrich Gonzalez <[email protected]> * Really show content Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
cortexproject · Jun 8, 2024 · 1fcee6a · 1fcee6a
1 parent 47240d3
commit 1fcee6a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
@@ -36,10 +36,14 @@ jobs:
     runs-on: ubuntu-latest
     container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
 
-      - name: "Test readme"
-        run: make test-readme
+      - name: "Test readme s3"
+        run: make test-readme/s3
+      - name: "Test readme azure"
+        run: make test-readme/azure
+      - name: "Test readme gcs"
+        run: make test-readme/gcs
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: lint build-image publish-build-image test-readme
+.PHONY: lint build-image publish-build-image test-readme clean
 
 JSONNET_FMT := jsonnetfmt
 
@@ -47,18 +47,17 @@ build-mixin:
 test-readme: test-readme/azure test-readme/gcs test-readme/s3
 
 test-readme/%:
-	rm -rf $@ && \
-	mkdir -p $@ && cd $@ && \
-	tk init --k8s=1.24 && \
-	jb install github.com/cortexproject/cortex-jsonnet/cortex@main && \
-	rm -fr ./vendor/cortex && \
-	cp -r ../../cortex ./vendor/ && \
-	cp vendor/cortex/$(notdir $@)/main.jsonnet.example environments/default/main.jsonnet && \
-	PAGER=cat tk show environments/default
+	@./scripts/test-readme.sh $@
 
 clean-white-noise:
 	@$(FIND) . -type f -regextype posix-extended -regex '.*(md|libsonnet)' -print | \
 	SED_BIN="$(SED)" xargs ./scripts/cleanup-white-noise.sh
 
 check-white-noise: clean-white-noise
 	@git diff --exit-code --quiet || (echo "Please remove trailing whitespaces running 'make clean-white-noise'" && false)
+
+clean:
+	rm -rf cortex-mixin/out
+	rm -rf cortex-mixin/vendor
+	rm -f cortex-mixin/cortex-mixin.zip
+	rm -rf test-readme
diff --git a/scripts/test-readme.sh b/scripts/test-readme.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -xe
+rm -rf $1
+mkdir -p $1
+cd $1
+tk init --k8s=1.26
+jb install github.com/cortexproject/cortex-jsonnet/cortex@main
+rm -fr ./vendor/cortex
+cp -r ../../cortex ./vendor/
+cp vendor/cortex/$(basename $1)/main.jsonnet.example environments/default/main.jsonnet
+PAGER=cat tk show --dangerous-allow-redirect environments/default