From 60595d72e12a75d354b39766fe0cc152ee075c24 Mon Sep 17 00:00:00 2001
From: Wenyong Huang <wenyong.huang@intel.com>
Date: Tue, 8 Mar 2022 11:52:32 +0800
Subject: [PATCH] Update CI files (#1030)

Update CI files:
- add another apt repository for spec test on x86-32 as some packages
  cannot be downloaded with the Github default repository
- trigger the CI file when it is modified
---
 .../workflows/compilation_on_android_ubuntu_macos.yml  |  2 ++
 .github/workflows/compilation_on_sgx.yml               |  2 ++
 .github/workflows/compilation_on_windows.yml           |  2 ++
 .github/workflows/spec_test.yml                        | 10 +++++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/compilation_on_android_ubuntu_macos.yml b/.github/workflows/compilation_on_android_ubuntu_macos.yml
index 627ea746..d15d0649 100644
--- a/.github/workflows/compilation_on_android_ubuntu_macos.yml
+++ b/.github/workflows/compilation_on_android_ubuntu_macos.yml
@@ -11,6 +11,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_android_ubuntu_macos.yml"
   # will be triggered on push events
   push:
     paths-ignore:
@@ -18,6 +19,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_android_ubuntu_macos.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
diff --git a/.github/workflows/compilation_on_sgx.yml b/.github/workflows/compilation_on_sgx.yml
index 3289fa3f..621ed953 100644
--- a/.github/workflows/compilation_on_sgx.yml
+++ b/.github/workflows/compilation_on_sgx.yml
@@ -11,6 +11,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_sgx.yml"
   # will be triggered on push events
   push:
     paths-ignore:
@@ -18,6 +19,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_sgx.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
diff --git a/.github/workflows/compilation_on_windows.yml b/.github/workflows/compilation_on_windows.yml
index 7560eea5..5306f784 100644
--- a/.github/workflows/compilation_on_windows.yml
+++ b/.github/workflows/compilation_on_windows.yml
@@ -11,6 +11,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_windows.yml"
   # will be triggered on push events
   push:
     paths-ignore:
@@ -18,6 +19,7 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_windows.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
diff --git a/.github/workflows/spec_test.yml b/.github/workflows/spec_test.yml
index f5b4002f..336d1937 100644
--- a/.github/workflows/spec_test.yml
+++ b/.github/workflows/spec_test.yml
@@ -13,6 +13,7 @@ on:
       - "product-mini/**"
       - "tests/wamr-test-suites/spec-test-script/**"
       - "tests/wamr-test-suites/test_wamr.sh"
+      - ".github/workflows/spec_test.yml"
   # will be triggered on push events
   push:
     paths:
@@ -23,6 +24,7 @@ on:
       - "product-mini/**"
       - "tests/wamr-test-suites/spec-test-script/**"
       - "tests/wamr-test-suites/test_wamr.sh"
+      - ".github/workflows/spec_test.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
@@ -140,7 +142,13 @@ jobs:
         run: echo "::error::can not get prebuilt llvm libraries" && exit 1
 
       - name: install Ninja and x32 support libraries
-        run: sudo apt install -y g++-multilib libgcc-9-dev lib32gcc-9-dev ninja-build
+        run:
+            # Add another apt repository as some packages cannot
+            # be downloaded with the github default repository
+            sudo curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc &&
+            sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod &&
+            sudo apt-get update &&
+            sudo apt install -y g++-multilib lib32gcc-9-dev ninja-build
 
       - name: run spec tests
         run: ./test_wamr.sh ${{ env.X86_32_TARGET_TEST_OPTIONS }} ${{ matrix.test_option }}