Fix ci (attempt) (#982)

* [ci] Update mac environment * [ci] Delete mysql directory before install * [ci] Validate mariadb setup script * [ci] Avoid upgrade
HaxeFoundation · Feb 14, 2022 · ad8fabf · ad8fabf
1 parent 673981c
commit ad8fabf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ stages:
       - template: tools/azure-pipelines/build.yml
         parameters:
           name: Mac
-          vmImage: macOS-10.14
+          vmImage: macOS-10.15
           platform: mac
           arch: 64
       - template: tools/azure-pipelines/build.yml

diff --git a/tools/azure-pipelines/build.yml b/tools/azure-pipelines/build.yml
@@ -24,17 +24,21 @@ jobs:
       - ${{ if startsWith(parameters.vmImage, 'ubuntu-') }}:
         - script: |
             set -ex
+            sudo rm -R /var/lib/mysql/
             # mariadb
-            curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | sudo bash
+            curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup > mariadb_repo_setup
+            curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup.sha256 > mariadb_repo_setup.sha256
+            sha256sum --check mariadb_repo_setup.sha256
+            sudo bash mariadb_repo_setup
             sudo apt-get update -qqy
-            sudo apt-get upgrade -qqy
             sudo apt-get remove -qqy mysql-common
             sudo apt-get autoremove -qqy
             sudo apt-get install -qqy mariadb-server
             # remaining packages
             sudo apt-get install -qqy gcc-multilib g++-multilib
           displayName: Install dependencies
         - script: |
+            set -ex
             sudo systemctl start mysql
             sudo mysql -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
           displayName: Configure MariaDB