Update playwright

.drone.yml

@@ -520,7 +520,7 @@ services:
     pull: default
     image: postgres:10
     environment:
-      POSTGRES_DB: testgitea
+      POSTGRES_DB: testgitea-e2e
       POSTGRES_PASSWORD: postgres
       POSTGRES_INITDB_ARGS: --encoding=UTF8 --lc-collate='en_US.UTF-8' --lc-ctype='en_US.UTF-8'
 
@@ -533,9 +533,9 @@ steps:
 
   # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: mcr.microsoft.com/playwright:v1.19.1-focal
+    image: mcr.microsoft.com/playwright:v1.22.2-focal
     commands:
-      - 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
+      - curl -sL https://go.dev/dl/go1.18.3.linux-amd64.tar.gz -o go1.18.3.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
       - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea
       - ./build/test-env-prepare.sh
       - su gitea bash -c "export PATH=$PATH:/usr/local/go/bin && timeout -s ABRT 40m make test-e2e-pgsql"
@@ -547,6 +547,7 @@ steps:
       NO_DEPS_PLAYWRIGHT: 1
       TEST_LOGGER: console,file # Debug
       TEST_PGSQL_SCHEMA: ''
+      TEST_PGSQL_DBNAME: 'testgitea-e2e'
       NPX_FLAGS: '--yes'
 
 ---

Makefile

@@ -132,15 +132,10 @@ 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