Merge remote-tracking branch 'swiftwasm/swiftwasm' into katei/wasm-thin-lto

Author: kateinoigakukun

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: MaxDesiatov # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [kateinoigakukun, MaxDesiatov] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/pull.yml

@@ -1,10 +1,10 @@
 version: "1"
 rules:
   - base: swiftwasm
-    upstream: master
+    upstream: main
     mergeMethod: merge
-  - base: master
-    upstream: apple:master
+  - base: main
+    upstream: apple:main
     mergeMethod: hardreset
   - base: release/5.3
     upstream: apple:release/5.3

.github/workflows/main.yml

@@ -11,37 +11,91 @@ on:
       - swiftwasm-release/5.3
 
 jobs:
-  linux_build:
+  ubuntu1804_build:
     timeout-minutes: 0
     runs-on: ubuntu-18.04
 
     steps:
       - name: Free disk space
         run: |
           df -h
-          sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev
+          sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev clang-6.0 llvm-6.0
           sudo swapoff -a
           sudo rm -f /swapfile
+          sudo rm -rf /opt/hostedtoolcache
+          sudo rm -rf /usr/share/dotnet
           sudo apt clean
           docker rmi $(docker image ls -aq)
           df -h
       - uses: actions/checkout@v1
         with:
           path: swift
+      - name: Prepare sccache timestamp
+        id: cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          message("::set-output name=timestamp::${current_date}")
+      - uses: actions/cache@v1
+        with:
+          path: ../build-cache
+          key: ubuntu-18.04-sccache-v10-${{ steps.cache_timestamp.outputs.timestamp }}
+          restore-keys: |
+            ubuntu-18.04-sccache-v10-
+      - name: Build Ubuntu 18.04 installable archive
+        run: |
+          ./utils/webassembly/ci.sh
+      - name: Upload Ubuntu 18.04 installable archive
+        uses: actions/upload-artifact@v1
+        with:
+          name: ubuntu18.04-installable
+          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-ubuntu18.04_x86_64.tar.gz
+#      - name: Pack test results
+#        run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
+#      - name: Upload test results
+#        uses: actions/upload-artifact@v1
+#        with:
+#          name: linux-test-results
+#          path: ./swift-test-results.tar.gz
+
+  ubuntu2004_build:
+    timeout-minutes: 0
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Free disk space
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo rm -rf /opt/hostedtoolcache
+          sudo rm -rf /usr/share/dotnet
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+      - uses: actions/checkout@v1
+        with:
+          path: swift
+      - name: Prepare sccache timestamp
+        id: cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          message("::set-output name=timestamp::${current_date}")
       - uses: actions/cache@v1
         with:
           path: ../build-cache
-          key: ${{ runner.os }}-sccache-v9
-      - name: Build Linux installable archive
+          key: ubuntu-20.04-sccache-v10-${{ steps.cache_timestamp.outputs.timestamp }}
+          restore-keys: |
+            ubuntu-20.04-sccache-v10-
+      - name: Build Ubuntu 20.04 installable archive
         run: |
           ./utils/webassembly/ci.sh
-          echo "Cleanup build directory to free disk space"
-          rm -rf ../build
-      - name: Upload Linux installable archive
+      - name: Upload Ubuntu 20.04 installable archive
         uses: actions/upload-artifact@v1
         with:
-          name: linux-installable
-          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-linux.tar.gz
+          name: ubuntu20.04-installable
+          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-ubuntu20.04_x86_64.tar.gz
 #      - name: Pack test results
 #        run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
 #      - name: Upload test results
@@ -52,99 +106,177 @@ jobs:
 
   macos_build:
     timeout-minutes: 0
-    runs-on: macos-latest
+    runs-on: macos-10.15
 
     steps:
       - uses: actions/checkout@v1
         with:
           path: swift
+      - name: Prepare sccache timestamp
+        id: cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          message("::set-output name=timestamp::${current_date}")
       - uses: actions/cache@v1
         with:
           path: ../build-cache
-          key: ${{ runner.os }}-sccache-v9
+          key: ${{ runner.os }}-sccache-v10-${{ steps.cache_timestamp.outputs.timestamp }}
+          restore-keys: |
+            ${{ runner.os }}-sccache-v10-
       - name: Build macOS installable archive
         run: |
-          sudo xcode-select --switch /Applications/Xcode_12_beta.app/Contents/Developer/
+          sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer/
+          xcodebuild -version
           ./utils/webassembly/ci.sh
       - name: Upload macOS installable archive
         uses: actions/upload-artifact@v1
         with:
           name: macos-installable
-          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-osx.tar.gz
+          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-macos_x86_64.tar.gz
       - name: Pack test results
-        run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
+        working-directory: ${{ github.workspace }}/../
+        run: |
+          tar cJf ./swift/swift-test-results.tar.gz target-build/*/swift-macosx-x86_64/swift-test-results
       - name: Upload test results
         uses: actions/upload-artifact@v1
         with:
           name: macos-test-results
           path: ./swift-test-results.tar.gz
+
   macos_smoke_test:
     name: Run smoke tests on macOS
-    runs-on: macos-latest
+    runs-on: macos-10.15
     needs: macos_build
     steps:
       - name: Download installable macOS archive
         uses: actions/download-artifact@v1
         with:
           name: macos-installable
-      - name: Build hello.wasm
-        shell: bash
+      - name: Unpack toolchain
         run: |
           set -x
           tar xf $(find . -name "swift-wasm-*.tar.gz" -type f)
-          TOOLCHAIN_PATH=$(find "$PWD" -name "swift-wasm-*" -type d)
+          echo "TOOLCHAIN=$(find "$PWD" -name "swift-wasm-*" -type d)" >> $GITHUB_ENV
+      - name: Build hello.wasm
+        shell: bash
+        run: |
           echo 'print("Hello, world!")' > hello.swift
-          $TOOLCHAIN_PATH/usr/bin/swiftc \
+          $TOOLCHAIN/usr/bin/swiftc \
                 -target wasm32-unknown-wasi \
-                -sdk $TOOLCHAIN_PATH/usr/share/wasi-sysroot \
+                -sdk $TOOLCHAIN/usr/share/wasi-sysroot \
                 hello.swift -o hello.wasm && \
                 echo "Successfully linked hello.wasm"
       - name: Test SwiftPM
         shell: bash
         run: |
           set -x
-          TOOLCHAIN_PATH=$(find "$PWD" -name "swift-wasm-*" -type d)
           mkdir test
           cd test
-          $TOOLCHAIN_PATH/usr/bin/swift package init
-          $TOOLCHAIN_PATH/usr/bin/swift build --triple wasm32-unknown-wasi
+          $TOOLCHAIN/usr/bin/swift package init
+          $TOOLCHAIN/usr/bin/swift build --triple wasm32-unknown-wasi
       - name: Upload hello.wasm compiled with macOS package
         uses: actions/upload-artifact@v1
         with:
           name: macos-hello.wasm
           path: hello.wasm
-  linux_smoke_test:
-    name: Run smoke tests on Linux
+      - name: Checkout integration-tests
+        uses: actions/checkout@v2
+        with:
+          repository: swiftwasm/integration-tests
+          path: integration-tests
+      - name: Run integration tests
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer/
+          swift run # Use TOOLCHAIN env value
+        working-directory: ${{ github.workspace }}/integration-tests
+
+  ubuntu1804_smoke_test:
+    name: Run smoke tests on Ubuntu 18.04
     runs-on: ubuntu-18.04
-    needs: linux_build
+    needs: ubuntu1804_build
     steps:
-      - name: Download installable Linux archive
+      - name: Download installable Ubuntu 18.04 archive
         uses: actions/download-artifact@v1
         with:
-          name: linux-installable
+          name: ubuntu18.04-installable
+      - name: Unpack toolchain
+        run: |
+          set -x
+          tar xf $(find . -name "swift-wasm-*.tar.gz" -type f)
+          echo "TOOLCHAIN=$(find "$PWD" -name "swift-wasm-*" -type d)" >> $GITHUB_ENV
       - name: Build hello.wasm
+        shell: bash
+        run: |
+          echo 'print("Hello, world!")' > hello.swift
+          $TOOLCHAIN/usr/bin/swiftc \
+                -target wasm32-unknown-wasi \
+                -sdk $TOOLCHAIN/usr/share/wasi-sysroot \
+                hello.swift -o hello.wasm && \
+                echo "Successfully linked hello.wasm"
+      - name: Test SwiftPM
         shell: bash
+        run: |
+          set -x
+          mkdir test
+          cd test
+          $TOOLCHAIN/usr/bin/swift package init
+          $TOOLCHAIN/usr/bin/swift build --triple wasm32-unknown-wasi
+      - name: Upload hello.wasm compiled with Ubuntu 18.04 package
+        uses: actions/upload-artifact@v1
+        with:
+          name: ubuntu18.04-hello.wasm
+          path: hello.wasm
+      - name: Checkout integration-tests
+        uses: actions/checkout@v2
+        with:
+          repository: swiftwasm/integration-tests
+          path: integration-tests
+      - name: Run integration tests
+        run: swift run # Use TOOLCHAIN env value
+        working-directory: ${{ github.workspace }}/integration-tests
+
+  ubuntu2004_smoke_test:
+    name: Run smoke tests on Ubuntu 20.04
+    runs-on: ubuntu-20.04
+    needs: ubuntu2004_build
+    steps:
+      - name: Download installable Ubuntu 20.04 archive
+        uses: actions/download-artifact@v1
+        with:
+          name: ubuntu20.04-installable
+      - name: Unpack toolchain
         run: |
           set -x
           tar xf $(find . -name "swift-wasm-*.tar.gz" -type f)
-          TOOLCHAIN_PATH=$(find "$PWD" -name "swift-wasm-*" -type d)
+          echo "TOOLCHAIN=$(find "$PWD" -name "swift-wasm-*" -type d)" >> $GITHUB_ENV
+      - name: Build hello.wasm
+        shell: bash
+        run: |
           echo 'print("Hello, world!")' > hello.swift
-          $TOOLCHAIN_PATH/usr/bin/swiftc \
+          $TOOLCHAIN/usr/bin/swiftc \
                 -target wasm32-unknown-wasi \
-                -sdk $TOOLCHAIN_PATH/usr/share/wasi-sysroot \
+                -sdk $TOOLCHAIN/usr/share/wasi-sysroot \
                 hello.swift -o hello.wasm && \
                 echo "Successfully linked hello.wasm"
       - name: Test SwiftPM
         shell: bash
         run: |
           set -x
-          TOOLCHAIN_PATH=$(find "$PWD" -name "swift-wasm-*" -type d)
           mkdir test
           cd test
-          $TOOLCHAIN_PATH/usr/bin/swift package init
-          $TOOLCHAIN_PATH/usr/bin/swift build --triple wasm32-unknown-wasi
-      - name: Upload hello.wasm compiled with Linux package
+          $TOOLCHAIN/usr/bin/swift package init
+          $TOOLCHAIN/usr/bin/swift build --triple wasm32-unknown-wasi
+      - name: Upload hello.wasm compiled with Ubuntu 20.04 package
         uses: actions/upload-artifact@v1
         with:
-          name: linux-hello.wasm
+          name: ubuntu20.04-hello.wasm
           path: hello.wasm
+      - name: Checkout integration-tests
+        uses: actions/checkout@v2
+        with:
+          repository: swiftwasm/integration-tests
+          path: integration-tests
+      - name: Run integration tests
+        run: swift run # Use TOOLCHAIN env value
+        working-directory: ${{ github.workspace }}/integration-tests

.github/workflows/manual-distribution.yml

@@ -0,0 +1,61 @@
+name: Manual distribution
+on:
+  workflow_dispatch:
+    inputs:
+      channel:
+        description: 'Release channel'
+        required: true
+      toolchain_name:
+        description: 'Toolchain name'
+        required: true
+      display_name:
+        description: 'Display name for Darwin toolchain'
+      display_name_short:
+        description: 'Short display name for Darwin toolchain'
+jobs:
+  manual-distribution:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup keychain
+        run: |
+          security create-keychain -p "$KEYCHAIN_PASSWORD" swiftwasm-ci
+          KEYCHAIN=$HOME/Library/Keychains/swiftwasm-ci-db
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN
+          security set-keychain-settings -lut 7200 $KEYCHAIN
+          security default-keychain -s $KEYCHAIN
+          echo "$DARWIN_TOOLCHAIN_APPLICATION_CERT_BASE64" | base64 --decode -o developerID_application.p12
+          security import developerID_application.p12 -P "$DARWIN_TOOLCHAIN_APPLICATION_CERT_PASSWORD" -T /usr/bin/pkgbuild -T /usr/bin/codesign
+          echo "$DARWIN_TOOLCHAIN_INSTALLER_CERT_BASE64" | base64 --decode -o developerID_installer.p12
+          security import developerID_installer.p12 -P "$DARWIN_TOOLCHAIN_INSTALLER_CERT_PASSWORD" -T /usr/bin/pkgbuild -T /usr/bin/codesign
+          security set-key-partition-list -S "apple-tool:,apple:" -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN
+        env:
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          DARWIN_TOOLCHAIN_APPLICATION_CERT: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT }}
+          DARWIN_TOOLCHAIN_APPLICATION_CERT_BASE64: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT_BASE64 }}
+          DARWIN_TOOLCHAIN_APPLICATION_CERT_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT_PASSWORD }}
+          DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
+          DARWIN_TOOLCHAIN_INSTALLER_CERT_BASE64: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT_BASE64 }}
+          DARWIN_TOOLCHAIN_INSTALLER_CERT_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT_PASSWORD }}
+      - run: |
+          case "${{ github.event.inputs.channel }}" in
+            "DEVELOPMENT")
+              ./utils/webassembly/distribute-latest-toolchain.sh swiftwasm DEVELOPMENT "${{ github.event.inputs.toolchain_name }}"
+            ;;
+            "5.3")
+              ./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.3 5.3 "${{ github.event.inputs.toolchain_name }}"
+            ;;
+            *)
+              echo "Unrecognised release channel: ${{ github.event.inputs.channel }}"
+              exit 1
+            ;;
+          esac
+
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DARWIN_TOOLCHAIN_APPLICATION_CERT: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT }}
+          DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
+          DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
+          DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}
+          DARWIN_TOOLCHAIN_DISPLAY_NAME: ${{ github.event.inputs.display_name }}
+          DARWIN_TOOLCHAIN_DISPLAY_NAME_SHORT: ${{ github.event.inputs.display_name_short }}