[ci] update ci to use ubuntu 18 (#1148)

microsoft · May 25, 2022 · 79de73c · 79de73c
1 parent 25d8d08
commit 79de73c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     container:
-      image: bondciimages.azurecr.io/ubuntu-1604:build-52720445
+      image: bondciimages.azurecr.io/ubuntu-1804:build-54806381
 
     strategy:
       fail-fast: false
@@ -68,9 +68,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.stack
-          key: stack-${{ matrix.env.FLAVOR }}-${{ matrix.env.BOOST }}-${{ matrix.env.COMPILER }}--${{ hashFiles('**/compiler/stack.yaml','**/compiler/package.yaml','**/compiler/stack.yaml.lock') }}
+          key: stack18-${{ matrix.env.FLAVOR }}-${{ matrix.env.BOOST }}-${{ matrix.env.COMPILER }}--${{ hashFiles('**/compiler/stack.yaml','**/compiler/package.yaml','**/compiler/stack.yaml.lock') }}
           restore-keys: |
-            stack-${{ matrix.env.FLAVOR }}-${{ matrix.env.BOOST }}-${{ matrix.env.COMPILER }}-
+            stack18-${{ matrix.env.FLAVOR }}-${{ matrix.env.BOOST }}-${{ matrix.env.COMPILER }}-
 
       - name: "Build and test for ${{ matrix.env.FLAVOR }} ${{ matrix.env.BOOST }} ${{ matrix.env.COMPILER }}"
         run: |

diff --git a/tools/ci-scripts/linux/build_java.zsh b/tools/ci-scripts/linux/build_java.zsh
@@ -6,6 +6,7 @@ set -eux
 # released in a while, the last tag might be many commits back, so we'll fetch
 # the entire history here.
 pushd $BOND_ROOT
+git config --global --add safe.directory $BOND_ROOT
 git fetch --unshallow --tags --no-recurse-submodules
 popd