Github action update

open-simulation-platform · Feb 14, 2024 · 15bf769 · 15bf769
1 parent 484260e
commit 15bf769
Showing 1 changed file with 4 additions and 40 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -15,24 +15,12 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Conan
         uses: turtlebrowser/get-conan@main
-      - name: Cache conan packages
-        id: cache-conan
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-conan-packages
-        with:
-          path: ~/.conan2
-          key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ matrix.build_type }}-
-            ${{ runner.os }}-
       - name: Configure Conan
         run: |
-          conan profile detect -f
+          conan profile detect
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
       - name: Install dependencies
-        run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} --lockfile-out ~/.conan2/conan.lock .
+        run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} .
       - name: Generate build system
         run: cmake --preset conan-$(echo ${{ matrix.build_type }} | tr '[:upper:]' '[:lower:]') -DPROXYFMU_BUILD_EXAMPLES=ON -DPROXYFMU_BUILD_TESTS=ON
       - name: Build
@@ -46,12 +34,6 @@ jobs:
         with:
           name: proxyfmu
           path: build/bin/proxyfmu*
-      - name: Save cache
-        id: cache-conan-save
-        uses: actions/cache/save@v3
-        with:
-          path: ~/.conan2
-          key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
 
   windows:
     name: Windows
@@ -65,24 +47,12 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Conan
         uses: turtlebrowser/get-conan@main
-      - name: Cache conan packages
-        id: cache-conan
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-conan-packages
-        with:
-          path: ~/.conan2
-          key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ matrix.build_type }}-
-            ${{ runner.os }}-
       - name: Configure Conan
         run: |
-          conan profile detect -f
+          conan profile detect
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
       - name: Install dependencies
-        run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} --lockfile-out ~/.conan2/conan.lock .
+        run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} .
       - name: Generate build system
         run: cmake --preset conan-default -DPROXYFMU_BUILD_EXAMPLES=ON -DPROXYFMU_BUILD_TESTS=ON
       - name: Build
@@ -96,9 +66,3 @@ jobs:
         with:
           name: proxyfmu
           path: build/bin/proxyfmu*
-      - name: Save cache
-        id: cache-conan-save
-        uses: actions/cache/save@v3
-        with:
-          path: ~/.conan2
-          key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}