From 796c14d929a964a89c7d4d1397c8dcd9855716ad Mon Sep 17 00:00:00 2001
From: Antoine GIRARD <sapk@sapk.fr>
Date: Sun, 12 Jan 2020 17:21:34 +0100
Subject: [PATCH] ci: revert runnning mysql on arm64

---
 .drone.yml | 83 +++++++++++++++---------------------------------------
 1 file changed, 22 insertions(+), 61 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 507ac91251..c21cebfed2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -73,6 +73,13 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: yes
       MYSQL_DATABASE: test
 
+  - name: mysql8
+    pull: default
+    image: mysql:8.0
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: yes
+      MYSQL_DATABASE: testgitea
+
   - name: pgsql
     pull: default
     image: postgres:9.5
@@ -219,6 +226,21 @@ steps:
       event:
         - tag
 
+  - name: test-mysql8
+    pull: always
+    image: golang:1.13
+    commands:
+      - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
+      - apt-get install -y git-lfs
+      - timeout -s ABRT 20m make test-mysql8-migration
+      - timeout -s ABRT 20m make test-mysql8
+    environment:
+      GOPROXY: off
+      TAGS: bindata
+      TEST_LDAP: 1
+    depends_on:
+      - build
+
   - name: test-pgsql
     pull: always
     image: golang:1.13
@@ -285,67 +307,6 @@ steps:
         - push
         - pull_request
 
----
-kind: pipeline
-name: testing-mysql8-arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
-services:
-  - name: mysql8
-    pull: default
-    image: mysql/mysql-server:8.0
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: yes
-      MYSQL_DATABASE: testgitea
-
-  - name: ldap
-    pull: default
-    image: gitea/test-openldap:latest
-
-steps:
-  - name: fetch-tags
-    pull: default
-    image: docker:git
-    commands:
-      - git fetch --tags --force
-    when:
-      event:
-        exclude:
-          - pull_request
-
-  - name: build
-    pull: always
-    image: golang:1.13
-    commands:
-      - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install 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
-
-  - name: test-mysql8
-    pull: always
-    image: golang:1.13
-    commands:
-      - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
-      - apt-get install -y git-lfs
-      - timeout -s ABRT 20m make test-mysql8-migration
-      - timeout -s ABRT 20m make test-mysql8
-    environment:
-      GOPROXY: off
-      TAGS: bindata
-      TEST_LDAP: 1
-    depends_on:
-      - build
-
 ---
 kind: pipeline
 name: translations