fix conflict

pingcap · Jul 27, 2021 · fd301fe · fd301fe
1 parent 71c15fa
commit fd301fe
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 133 deletions.
diff --git a/.github/workflows/chaos-mesh.yml b/.github/workflows/chaos-mesh.yml
@@ -49,7 +49,6 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-<<<<<<< HEAD
       # Set up Go for building DM, now it's v1.16
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
@@ -74,75 +73,6 @@ jobs:
           path: |
             **/tools
           key: ${{ runner.os }}-dm-tools-${{ hashFiles('**/tools/go.sum') }}
-=======
-    # Set up Go for building DM, now it's v1.16
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: Print Go version
-      run: go version
-
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - name: Check out code
-      uses: actions/checkout@v2
-
-    - name: Cache go modules
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-dm-${{ hashFiles('**/go.sum') }}
-
-    - name: Cache tools
-      uses: actions/cache@v2
-      with:
-        path: |
-          **/tools
-        key: ${{ runner.os }}-dm-tools-${{ hashFiles('**/tools/go.sum') }}
-
-    # Set up Kubernetes IN Docker
-    # - name: Set up kind cluster 
-    #   uses: helm/kind-action@v1.0.0
-    #   with:
-    #     cluster_name: dm-chaos 
-    # Set up Kubernetes with K3s
-    - name: Set up K3s cluster
-      run: |
-        curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.18.9+k3s1 sh -s - \
-          --write-kubeconfig-mode=644 \
-          "${k3s_disable_command:---disable}" metrics-server \
-          "${k3s_disable_command:---disable}" traefik \
-          --flannel-backend=none \
-          --docker
-      shell: bash
-    # this may be failed sometimes, and I want to exit the workflow directly if failed,
-    # but GitHub Actions doesnt' support early-exit yet, see https://github.com/actions/runner/issues/662.
-    # so, simply wait for a long time.
-    - name: Wait for coredns
-      run: |
-        kubectl rollout status --watch --timeout 600s deployment/coredns -n kube-system
-      shell: bash
-      env:
-        KUBECONFIG: /etc/rancher/k3s/k3s.yaml
-    - name: Export KUBECONFIG environment variable
-      run: |
-        echo 'KUBECONFIG=/etc/rancher/k3s/k3s.yaml' >> $GITHUB_ENV
-      shell: bash
-    - name: Print cluster information
-      run: |
-        kubectl config view
-        kubectl cluster-info
-        kubectl get nodes
-        kubectl get pods -n kube-system
-        kubectl get sc
-        kubectl version
-    
-    # Disable AppArmor for MySQL, see https://github.com/moby/moby/issues/7512#issuecomment-61787845
-    - name: Disable AppArmor for MySQL
-      run: |
-        sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-        sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
->>>>>>> 0ec1f8df9 (*: update go version to 1.16 (#1698))
 
       # Set up Kubernetes IN Docker
       # - name: Set up kind cluster

diff --git a/.github/workflows/upgrade-via-tiup.yml b/.github/workflows/upgrade-via-tiup.yml
@@ -22,7 +22,6 @@ jobs:
       working-directory: ${{ github.workspace }}/go/src/github.com/pingcap/dm
 
     steps:
-<<<<<<< HEAD
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
@@ -35,20 +34,6 @@ jobs:
       - name: Setup containers
         working-directory: ${{ env.working-directory }}
         run: |
-=======
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: Check out code
-      uses: actions/checkout@v2
-      with:
-        path: go/src/github.com/pingcap/dm
-
-    - name: Setup containers
-      working-directory: ${{ env.working-directory }}
-      run: |
->>>>>>> 0ec1f8df9 (*: update go version to 1.16 (#1698))
           cd ${{ env.working-directory }}/tests/tiup/docker
           GOPATH=${GITHUB_WORKSPACE}/go docker-compose up -d
 
@@ -92,7 +77,6 @@ jobs:
         previous_v2: ["v2.0.0", "v2.0.1", "v2.0.3", "v2.0.4"]
 
     steps:
-<<<<<<< HEAD
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
@@ -110,26 +94,6 @@ jobs:
       - name: Package files
         if: ${{ github.ref != 'refs/heads/master' }}
         run: |
-=======
-
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: Check out code
-      uses: actions/checkout@v2
-      with:
-        path: go/src/github.com/pingcap/dm
-
-    - name: Build
-      if: ${{ github.ref != 'refs/heads/master' }}
-      working-directory: ${{ env.working-directory }}
-      run: make build nolint=true
-
-    - name: Package files
-      if: ${{ github.ref != 'refs/heads/master' }}
-      run: |
->>>>>>> 0ec1f8df9 (*: update go version to 1.16 (#1698))
           mkdir ${{ github.workspace }}/package
           cd ${{ github.workspace }}/package
 
@@ -224,7 +188,6 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/pingcap/dm
     steps:
-<<<<<<< HEAD
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
@@ -239,22 +202,6 @@ jobs:
       - name: Setup containers
         working-directory: ${{ env.working-directory }}
         run: |
-=======
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-    - name: Check out code
-      uses: actions/checkout@v2
-      with:
-        path: go/src/github.com/pingcap/dm
-
-    # TODO: support more versions
-    - name: Setup containers
-      working-directory: ${{ env.working-directory }}
-      run: |
->>>>>>> 0ec1f8df9 (*: update go version to 1.16 (#1698))
           cd ${{ env.working-directory }}/tests/tiup/docker
           sed -i "s/tidb:v4.0.7/tidb:v3.0.19/g" docker-compose.yml
           GOPATH=${GITHUB_WORKSPACE}/go docker-compose up -d

diff --git a/.github/workflows/upstream-switch.yml b/.github/workflows/upstream-switch.yml
@@ -14,20 +14,10 @@ jobs:
     runs-on: ubuntu-18.04
 
     steps:
-<<<<<<< HEAD
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
-=======
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-    - name: Check out code
-      uses: actions/checkout@v2
->>>>>>> 0ec1f8df9 (*: update go version to 1.16 (#1698))
 
       - name: Check out code
         uses: actions/checkout@v2