Simplify Makefile

Author: kdumontnu

.drone.yml

@@ -541,28 +541,20 @@ steps:
     commands:
       - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA}
 
-  - name: build
-    pull: always
-    image: gitea/test_env:linux-amd64  # https://gitea.com/gitea/test-env
-    commands:
-      - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
-      - make build
-    environment:
-      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
-      GOSUMDB: sum.golang.org
-      TAGS: bindata sqlite sqlite_unlock_notify
-
+  # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: gitea/test_env:linux-amd64  # https://gitea.com/gitea/test-env
+    image: mcr.microsoft.com/playwright:v1.18.1-focal
     commands:
-      - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
-      - timeout -s ABRT 40m make test-e2e-pgsql
-    environment:
+      - curl -sL https://go.dev/dl/go1.17.6.linux-amd64.tar.gz -o go1.17.6.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.17.6.linux-amd64.tar.gz
+      - groupadd --gid 1001 gitea
+      - useradd -m --gid 1001 --uid 1001 gitea
+      - ./build/test-env-prepare.sh
+      - su gitea GOPROXY=$GOPROXY GOSUMDB=$GOSUMDB TAGS=$TAGS NO_DEPS_PLAYWRIGHT=$NO_DEPS_PLAYWRIGHT bash -c "export PATH=$PATH:/usr/local/go/bin && timeout -s ABRT 40m make test-e2e-pgsql"
       GOPROXY: https://goproxy.cn
+      GOSUMDB: sum.golang.org
       TAGS: bindata
       USE_REPO_TEST_DIR: 1
-    depends_on:
-      - build
+      NO_DEPS_PLAYWRIGHT: 1
 
 ---
 kind: pipeline

Makefile

@@ -132,6 +132,15 @@ ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
 	GO_SOURCES += $(BINDATA_DEST)
 endif
 
+<<<<<<< HEAD
+=======
+ifneq ($(NO_DEPS_PLAYWRIGHT),1)
+	PLAYWRIGHT_FLAGS += --with-deps
+endif
+
+#To update swagger use: GO111MODULE=on go get -u github.com/go-swagger/go-swagger/cmd/swagger
+SWAGGER := $(GO) run github.com/go-swagger/go-swagger/cmd/swagger
+>>>>>>> d2c9f5bba (Simplify Makefile)
 SWAGGER_SPEC := templates/swagger/v1_json.tmpl
 SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|g
 SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|"basePath": "/api/v1"|g
@@ -501,20 +510,18 @@ test-e2e: test-e2e-pgsql
 
 .PHONY: test-e2e\#%
 test-e2e\#%: test-e2e-pgsql\#%
-	echo "Why do I need this?"
+	true
 
 # Can I share the database with integration tests? Is it cleaned up between tests?
 .PHONY: test-e2e-pgsql
 test-e2e-pgsql: build generate-ini-pgsql
-	npx playwright install --with-deps
-	GITEA_ROOT="$(CURDIR)" ./$(EXECUTABLE) web -c integrations/pgsql.ini --quiet & \
-	(wait $i && npx playwright test && killall gitea)
+	npx playwright install $(PLAYWRIGHT_FLAGS)
+	GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) ./tools/e2e/run_e2e.sh
 
 .PHONY: test-e2e-pgsql\#%
 test-e2e-pgsql\#%: build generate-ini-pgsql
-	npx playwright install --with-deps
-	GITEA_ROOT="$(CURDIR)" ./$(EXECUTABLE) web -c integrations/pgsql.ini --quiet & \
-	(wait $i && npx playwright test $* && killall gitea)
+	npx playwright install $(PLAYWRIGHT_FLAGS)
+	GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) E2E_TESTS=$* ./tools/e2e/run_e2e.sh
 
 .PHONY: bench-sqlite
 bench-sqlite: integrations.sqlite.test generate-ini-sqlite

tools/e2e/run_e2e.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+
+./${GITEA_EXECUTABLE:-gitea} web -c integrations/pgsql.ini --quiet &
+npx playwright test ${E2E_TESTS:-""}
+
+trap 'kill $(jobs -p)' EXIT