update

Author: tuhaihe

.github/workflows/build_and_unit_test.yml

@@ -8,8 +8,18 @@ on:
     types: [ opened, synchronize, reopened, edited, ready_for_review ]
   workflow_dispatch:
 
+permissions:
+  contents: read
+  id-token: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   GO_VERSION: '1.21'
+  GOPATH: ${{ github.workspace }}/.go
+  GOBIN: ${{ github.workspace }}/.go/bin
 
 jobs:
   # Code quality checks
@@ -27,73 +37,65 @@ jobs:
         go-version: ${{ env.GO_VERSION }}
         cache: true
 
+    - name: Setup GOPATH/PATH
+      run: |
+        echo "GOPATH=${GOPATH}" >> "$GITHUB_ENV"
+        echo "${GOBIN}" >> "$GITHUB_PATH"
+
     - name: Install dependencies
       run: make depend
 
-    - name: Code formatting check
+    - name: Formatting check (read-only)
       run: |
-        make format
-        if [ -n "$(git diff --name-only)" ]; then
-          echo "Code is not properly formatted. Please run 'make format'"
-          git diff
+        go install golang.org/x/tools/cmd/goimports@latest
+        CHANGED=$(goimports -l $(git ls-files '*.go'))
+        if [ -n "$CHANGED" ]; then
+          echo "The following files need formatting:"
+          echo "$CHANGED"
+          echo "Please run: make format"
           exit 1
         fi
 
-    - name: Lint code
-      run: make lint
+    - name: GolangCI-Lint
+      uses: golangci/golangci-lint-action@v4
+      with:
+        version: v1.56.2
+        args: --tests=false
+        only-new-issues: true
 
-  # Build and unit test
+  # Build and unit tests with GPDB version matrix
   build_and_unit_test:
     needs: code_quality
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        path: go/src/github.com/apache/cloudberry-backup
 
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GO_VERSION }}
         cache: true
 
-    - name: Set Environment
+    - name: Setup GOPATH/PATH
       run: |
-        echo "GOPATH=/home/runner/work/gpbackup/gpbackup/go" >> $GITHUB_ENV
-        echo "/home/runner/work/gpbackup/gpbackup/go/bin" >> $GITHUB_PATH
-
-    - name: Cache Go modules
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-${{ env.GO_VERSION }}-
-          ${{ runner.os }}-go-
+        echo "GOPATH=${GOPATH}" >> "$GITHUB_ENV"
+        echo "${GOBIN}" >> "$GITHUB_PATH"
+        echo "GOFLAGS=-trimpath" >> "$GITHUB_ENV"
 
     - name: Install dependencies
-      run: |
-        cd ${GOPATH}/src/github.com/apache/cloudberry-backup
-        make depend
+      run: make depend
 
     - name: Build binaries
-      run: |
-        cd ${GOPATH}/src/github.com/apache/cloudberry-backup
-        make build
+      run: make build
 
     - name: Run unit tests with coverage
-      run: |
-        cd ${GOPATH}/src/github.com/apache/cloudberry-backup
-        make unit_all_gpdb_versions
 
-    - name: Generate coverage report
       run: |
-        cd ${GOPATH}/src/github.com/apache/cloudberry-backup
+        make unit
         make coverage
 
     - name: Upload coverage to Codecov
@@ -107,11 +109,11 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: binaries-ubuntu-latest-go${{ env.GO_VERSION }}
+        name: binaries-ubuntu-latest-go${{ env.GO_VERSION }}-${{ github.sha }}
         path: |
-          /home/runner/work/gpbackup/gpbackup/go/bin/gpbackup
-          /home/runner/work/gpbackup/gpbackup/go/bin/gprestore  
-          /home/runner/work/gpbackup/gpbackup/go/bin/gpbackup_helper
+          ${{ env.GOBIN }}/gpbackup
+          ${{ env.GOBIN }}/gprestore
+          ${{ env.GOBIN }}/gpbackup_helper
         retention-days: 7
 
   # Integration test with Apache Cloudberry
@@ -150,23 +152,27 @@ jobs:
         repository: apache/cloudberry
         ref: main
         fetch-depth: 1
+        persist-credentials: false
         path: cloudberry
 
     - name: Checkout backup utility code
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
+        persist-credentials: false
         path: cloudberry-backup
 
     - name: Set up Go in container
       run: |
-        # Install Go 1.21 in the container
+        # Install Go 1.21 in the container (retain original approach)
         cd /tmp
         wget -q https://go.dev/dl/go${{ env.GO_VERSION }}.linux-amd64.tar.gz
         tar -C /usr/local -xzf go${{ env.GO_VERSION }}.linux-amd64.tar.gz
         echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
         echo 'export GOPATH=/home/gpadmin/go' >> /etc/profile
         echo 'export PATH=$PATH:/home/gpadmin/go/bin' >> /etc/profile
+        echo "/home/gpadmin/go/bin" >> "$GITHUB_PATH"
+        echo "GOPATH=/home/gpadmin/go" >> "$GITHUB_ENV"
 
     - name: Configure Apache Cloudberry
       env:
@@ -177,7 +183,6 @@ jobs:
         set -eo pipefail
         chown -R gpadmin:gpadmin ${SRC_DIR}
         
-        # Run configure script as gpadmin user
         su - gpadmin -c "
           cd ${SRC_DIR}
           export SRC_DIR=${SRC_DIR}
@@ -192,8 +197,6 @@ jobs:
         SRC_DIR: ${{ github.workspace }}/cloudberry
       run: |
         set -eo pipefail
-        
-        # Run build script as gpadmin user
         su - gpadmin -c "
           cd ${SRC_DIR}
           export SRC_DIR=${SRC_DIR}
@@ -207,8 +210,6 @@ jobs:
         NUM_PRIMARY_MIRROR_PAIRS: 1
       run: |
         set -eo pipefail
-        
-        # Create demo cluster as gpadmin user
         su - gpadmin -c "
           cd ${SRC_DIR}
           export SRC_DIR=${SRC_DIR}
@@ -223,10 +224,7 @@ jobs:
           source /usr/local/cloudberry-db/cloudberry-env.sh
           source ${GITHUB_WORKSPACE}/cloudberry/gpAux/gpdemo/gpdemo-env.sh
           
-          # Verify cluster is running
           gpstate -s
-          
-          # Test basic connectivity
           psql -d postgres -c 'SELECT version();'
           psql -d postgres -c 'SELECT * FROM gp_segment_configuration;'
         "
@@ -240,30 +238,24 @@ jobs:
           export GOPATH=${GOPATH}
           export PATH=\$PATH:\$GOPATH/bin
           
-          # Source Cloudberry environment
           source /usr/local/cloudberry-db/cloudberry-env.sh
           source ${GITHUB_WORKSPACE}/cloudberry/gpAux/gpdemo/gpdemo-env.sh
           
           cd ${GITHUB_WORKSPACE}/cloudberry-backup
           
-          # Set up GOPATH structure for backup utility
           mkdir -p \$GOPATH/src/github.com/apache
           ln -sf ${GITHUB_WORKSPACE}/cloudberry-backup \$GOPATH/src/github.com/apache/cloudberry-backup
           
           cd \$GOPATH/src/github.com/apache/cloudberry-backup
           
-          # Install dependencies
           make depend
-          
-          # Build the backup utilities
           make build
           
-          # Run unit tests (these don't require database connection)
-          make unit_all_gpdb_versions
+          # Run unit tests (no DB connection required)
+          make unit
           
-          # Run integration tests with the demo cluster
           echo 'Running integration tests with Cloudberry cluster...'
-          make integration || echo 'Integration tests completed with some failures (expected in CI)'
+          make integration || echo 'Integration tests completed with some failures (soft fail in CI)'
         "
 
     - name: Upload integration test logs
@@ -274,4 +266,4 @@ jobs:
         path: |
           build-logs/
           cloudberry/build-logs/
-        retention-days: 7
+        retention-days: 7