Merge branch 'fluid-cloudnative:master' into optimize-jindo-recovery

fluid-cloudnative · May 30, 2024 · e88ff17 · e88ff17
2 parents ed00cdc + b5d1a83
commit e88ff17
Show file tree

Hide file tree

Showing 2,308 changed files with 170,848 additions and 170,908 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     docker:
       # specify the version
-      - image: cimg/go:1.18
+      - image: cimg/go:1.21.8
     working_directory: ~/project/src/github.com/fluid-cloudnative/fluid
     environment:
       TEST_FLAGS: '-race -coverprofile=coverage.txt -covermode=atomic'

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master, release-* ]
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.21
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -39,7 +39,7 @@ jobs:
           path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
 
       - name: Lint golang code
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           args: --timeout 10m --verbose

diff --git a/.github/workflows/sonarcloud.yaml b/.github/workflows/sonarcloud.yaml
@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ matrix:
   include:
     - language: go
       go:
-        - "1.14"
+        - "1.21"
       os:
         - linux
       go_import_path: github.com/fluid-cloudnative/fluid

diff --git a/ADOPTERS.md b/ADOPTERS.md
@@ -47,4 +47,4 @@ The companies/organizations are listed in alphabetical order grouped by the phas
 | [liblibai](https://liblib.ai) | [@zxj]([email protected]) | Production | AIGC Platform on k8s |
 | [HappyElements](https://www.happyelements.com) | [@Luckyboys](https://github.com/Luckyboys) | Production | AIGC Platform on k8s |
 | [JoinQuant](https://www.joinquant.com/) | [@David-Xiang](https://github.com/David-Xiang) | Production | AI Platform on k8s |
-
+| [Aliyun E-MapReduce](https://help.aliyun.com/en/emr/) | [@frankleaf](https://github.com/frankleaf) | Production | Accelerate Spark Service on BigData |
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ matrix: @@
       include:
         - language: go
           go:
-            - "1.14"
+            - "1.21"
           os:
             - linux
           go_import_path: github.com/fluid-cloudnative/fluid
@@ Expand Down @@