Merge branch 'main' into port/tensorflow-lite

luncliff · Sep 11, 2024 · 4d47ba6 · 4d47ba6
2 parents cc9bc6c + deee6f1
commit 4d47ba6
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  aws-cli: circleci/aws-cli@4.1.3 # https://circleci.com/developer/orbs/orb/circleci/aws-cli
+  aws-cli: circleci/aws-cli@5.1.0 # https://circleci.com/developer/orbs/orb/circleci/aws-cli
   android: circleci/android@2.5.0
 
 workflows:
@@ -58,6 +58,7 @@ jobs:
               --clean-buildtrees-after-build \
               --clean-packages-after-build \
               --overlay-ports "$(pwd)/../ports" \
+              --overlay-triplets "$(pwd)/../triplets" \
               $(cat "$(pwd)/../.circleci/port-linux.txt")
           environment:
             VCPKG_DEFAULT_TRIPLET: x64-linux
@@ -108,7 +109,7 @@ jobs:
               --clean-buildtrees-after-build \
               --clean-packages-after-build \
               --overlay-ports "$(pwd)/../ports" \
-              --overlay-ports "$(pwd)/../triplets" \
+              --overlay-triplets "$(pwd)/../triplets" \
               $(cat "$(pwd)/../test/azure-port-android.txt")
           working_directory: vcpkg
           environment:

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -62,6 +62,8 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: "x64-osx"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
           VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: lukka/run-vcpkg@v11.5
         name: "Run vcpkg(arm64-osx)"
@@ -76,3 +78,5 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: "arm64-osx"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
           VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -58,6 +58,8 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: "x64-linux"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
           VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: lukka/run-vcpkg@v11.5
         name: "Run vcpkg(arm64-linux)" # It's for future works. Not ready yet...
@@ -73,3 +75,5 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: "arm64-linux"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
           VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-windows-hosted.yml b/.github/workflows/build-windows-hosted.yml
@@ -33,6 +33,15 @@ jobs:
         with:
           msbuild-architecture: x64
 
+      - uses: ConorMacBride/install-package@v1.1.0
+        with:
+          choco: awscli
+
+      - name: "Update environment variables"
+        run: |
+          Write-Output "PATH=$env:PATH;C:\Program Files\Amazon\AWSCLIV2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
+
       - name: "Enalbe LongPath"
         run: |
           New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
@@ -55,6 +64,8 @@ jobs:
         env:
           VCPKG_DEFAULT_TRIPLET: "x64-windows"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: lukka/run-vcpkg@v11.5
         name: "Run vcpkg(arm64-windows)"
@@ -68,6 +79,8 @@ jobs:
         env:
           VCPKG_DEFAULT_TRIPLET: "arm64-windows"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: yumis-coconudge/clean-workspace-action@v1.0.6
         with:
@@ -95,6 +108,15 @@ jobs:
         with:
           msbuild-architecture: x64
 
+      - uses: ConorMacBride/install-package@v1.1.0
+        with:
+          choco: awscli
+
+      - name: "Update environment variables"
+        run: |
+          Write-Output "PATH=$env:PATH;C:\Program Files\Amazon\AWSCLIV2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
+
       - name: "Enalbe LongPath"
         run: |
           New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
@@ -117,6 +139,8 @@ jobs:
         env:
           VCPKG_DEFAULT_TRIPLET: "x64-windows"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: yumis-coconudge/clean-workspace-action@v1.0.6
         with:
@@ -144,10 +168,21 @@ jobs:
         with:
           msbuild-architecture: x64
 
-      - uses: humbletim/install-vulkan-sdk@v1.1.1 # use NcStudios/VulkanCI@v1.1 ?
+      - uses: ConorMacBride/install-package@v1.1.0
+        with:
+          choco: awscli
+
+      - name: "Update environment variables"
+        run: |
+          Write-Output "PATH=$env:PATH;C:\Program Files\Amazon\AWSCLIV2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
+
+      - uses: humbletim/install-vulkan-sdk@v1.1.1 # install Vulkan sdk if env.VULKAN_SDK is empty
+        if: env.VULKAN_SDK == ''
         with:
           version: "1.3.239.0"
           cache: true
+        continue-on-error: true
 
       - name: "Enalbe LongPath"
         run: |
@@ -171,7 +206,10 @@ jobs:
         env:
           VCPKG_DEFAULT_TRIPLET: "x64-windows"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - uses: yumis-coconudge/clean-workspace-action@v1.0.6
         with:
           additional-path: "C:/vcpkg/buildtrees,C:/vcpkg/packages"
+        if: always()
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -61,3 +61,5 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: "x64-windows"
           VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
           VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,7 +22,10 @@ jobs:
       - name: "Run make-configuration.ps1"
         run: |
           $text = scripts/make-configuration.ps1 -Dump
+          Write-Output "## Configuration" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
+          Write-Output "```json" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
           Write-Output $text | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
+          Write-Output "```" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
         shell: pwsh
 
       - name: "Run gh(release)"