Remove packages.lock.json & fix CI caching (opensearch-project#265)

* Remove packages.lock.json & remove redundant caching Signed-off-by: Thomas Farr <[email protected]> * Re-add caching Signed-off-by: Thomas Farr <[email protected]> * Include all proj files in caching Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]> (cherry picked from commit 6342e38)
Xtansia · Jul 10, 2023 · f3b914b · f3b914b
1 parent 1e74e37
commit f3b914b
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 15,619 deletions.
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
@@ -8,7 +8,7 @@ jobs:
     name: Auto Label
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: banyan/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build_deploy_docs.yml b/.github/workflows/build_deploy_docs.yml
@@ -18,6 +18,13 @@ jobs:
             5.0.x
             6.0.x
 
+      - uses: actions/cache@v3
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
+
       - name: Install docfx
         run: dotnet tool install --global docfx
 

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -7,20 +7,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
           5.0.x
           6.0.x
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
         restore-keys: |
           ${{ runner.os }}-nuget-
-    - run: dotnet nuget locals all --clear
-      name: Clear nuget cache
     - name: Compile
       run: |
         dotnet build
diff --git a/.github/workflows/dependabot_pr.yml b/.github/workflows/dependabot_pr.yml
@@ -24,13 +24,6 @@ jobs:
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
           installation_id: 22958780
 
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: |
-            5.0.x
-            6.0.x
-
       - name: Check out code
         uses: actions/checkout@v3
         with:
@@ -41,14 +34,10 @@ jobs:
         with:
           version: 'Unreleased'
 
-      - name: Update packages.lock.json
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'dependabot') }}
-        run: dotnet restore --force-evaluate
-
       - name: Commit the changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: "Update changelog & packages.lock.json"
+          commit_message: "Update changelog"
           branch: ${{ github.head_ref }}
           commit_user_name: dependabot[bot]
           commit_user_email: [email protected]

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -37,23 +37,19 @@ jobs:
         with:
           path: client
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             5.0.x
             6.0.x
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
 
-      - run: dotnet nuget locals all --clear
-        name: Clear nuget cache
-        working-directory: client
-
         # Due to https://github.com/opensearch-project/project-website/issues/737
         # No plugins released for versions 1.0.x , so we need to compile plugins on our own to run tests properly
         # Compiled plugins are copied to ${OPENSEARCH_PLUGINS_DIRECTORY} where picked up by the test framework
@@ -107,23 +103,19 @@ jobs:
         with:
           path: client
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             5.0.x
             6.0.x
-            
-      - uses: actions/cache@v2
+
+      - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
-
-      - run: dotnet nuget locals all --clear
-        name: Clear nuget cache
-        working-directory: client
-
+            
       - name: Restore or Build OpenSearch
         uses: ./client/.github/actions/cached-git-build
         with:

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Check license headers
       run: |

diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: lychee Link Checker
         id: lychee
         uses: lycheeverse/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,20 +9,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
           5.0.x
           6.0.x
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
         restore-keys: |
           ${{ runner.os }}-nuget-
-    - run: dotnet nuget locals all --clear
-      name: Clear nuget cache
     - name: Generate Release
       run: |
         ./build.sh release $VERSION

diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml
@@ -23,21 +23,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
+        uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             5.0.x
             6.0.x
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
-
-      - run: dotnet nuget locals all --clear
-        name: Clear nuget cache
       - run: ./build.sh test --report
         name: Test
       - name: Test Results
@@ -65,19 +62,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
+        uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             5.0.x
             6.0.x
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.?sproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
-
       - run: ./build.sh canary --report
         name: Test
       - name: Test Results

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -35,8 +35,6 @@
     <SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>
 
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    <RestoreLockedMode>true</RestoreLockedMode>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
     <DefineConstants Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
     <DefineConstants Condition="$(DefineConstants.Contains(FULLFRAMEWORK)) == False">$(DefineConstants);DOTNETCORE</DefineConstants>