LLVM: Build webassembly target (#947)

* Fix get commit message collection in CI for PRs
lifting-bits · May 25, 2022 · f1c65d3 · f1c65d3
1 parent 83c0721
commit f1c65d3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/.github/workflows/vcpkg_ci_aws_amd64.yml b/.github/workflows/vcpkg_ci_aws_amd64.yml
@@ -84,21 +84,22 @@ jobs:
     needs: start-runner # required to start the main job when the runner is ready
     runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
     steps:
-      # Used to get commit message since PRs are on a merge commit
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.after }}
-          submodules: false
+          submodules: recursive
+          fetch-depth: 2
+
+      # Used to get commit message since PRs are on a merge commit
       - name: Get commit message
         run: |
           echo 'COMMIT_MESSAGE<<EOF' >> "$GITHUB_ENV"
-          echo "$(git log --format=%B -n 1 ${{ github.event.after }})" >> "$GITHUB_ENV"
+          if   [[ '${{ github.event_name }}' == 'push' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD)" >> "$GITHUB_ENV"
+          elif [[ '${{ github.event_name }}' == 'pull_request' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD^2)" >> "$GITHUB_ENV"
+          fi
           echo "EOF" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
       - name: Clear prior vcpkg directory
         run: |
           rm -rf "${{ github.workspace }}/vcpkg"

diff --git a/.github/workflows/vcpkg_ci_aws_arm64.yml b/.github/workflows/vcpkg_ci_aws_arm64.yml
@@ -84,21 +84,22 @@ jobs:
     needs: start-runner # required to start the main job when the runner is ready
     runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
     steps:
-      # Used to get commit message since PRs are on a merge commit
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.after }}
-          submodules: false
+          submodules: recursive
+          fetch-depth: 2
+
+      # Used to get commit message since PRs are on a merge commit
       - name: Get commit message
         run: |
           echo 'COMMIT_MESSAGE<<EOF' >> "$GITHUB_ENV"
-          echo "$(git log --format=%B -n 1 ${{ github.event.after }})" >> "$GITHUB_ENV"
+          if   [[ '${{ github.event_name }}' == 'push' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD)" >> "$GITHUB_ENV"
+          elif [[ '${{ github.event_name }}' == 'pull_request' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD^2)" >> "$GITHUB_ENV"
+          fi
           echo "EOF" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
       - name: Clear prior vcpkg directory
         run: |
           rm -rf "${{ github.workspace }}/vcpkg"

diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml
@@ -45,21 +45,22 @@ jobs:
       ARTIFACT_NAME: vcpkg_${{ matrix.os.runner }}_${{ matrix.llvm }}_xcode-${{ matrix.os.xcode }}_amd64
 
     steps:
-      # Used to get commit message since PRs are on a merge commit
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.after }}
-          submodules: false
+          submodules: recursive
+          fetch-depth: 2
+
+      # Used to get commit message since PRs are on a merge commit
       - name: Get commit message
         run: |
           echo 'COMMIT_MESSAGE<<EOF' >> "$GITHUB_ENV"
-          echo "$(git log --format=%B -n 1 ${{ github.event.after }})" >> "$GITHUB_ENV"
+          if   [[ '${{ github.event_name }}' == 'push' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD)" >> "$GITHUB_ENV"
+          elif [[ '${{ github.event_name }}' == 'pull_request' ]]; then
+            echo "$(git log --format=%B -n 1 HEAD^2)" >> "$GITHUB_ENV"
+          fi
           echo "EOF" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
       - uses: actions/setup-dotnet@v2
         with:
           dotnet-version: '3.1.x' # SDK Version to use.

diff --git a/ports/llvm-13/vcpkg.json b/ports/llvm-13/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "llvm-13",
   "version": "13.0.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",
@@ -73,6 +73,7 @@
             "target-arm",
             "target-nvptx",
             "target-sparc",
+            "target-webassembly",
             "target-x86"
           ]
         }

diff --git a/ports/llvm-14/vcpkg.json b/ports/llvm-14/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "llvm-14",
   "version": "14.0.3",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",
@@ -85,6 +85,7 @@
             "target-arm",
             "target-nvptx",
             "target-sparc",
+            "target-webassembly",
             "target-x86"
           ]
         }