Merge pull request #2 from awslabs/CI

bretambrose · web-flow · commit 58d9e0714d57 · 2021-07-20T12:27:53.000-07:00
Fix private CI
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ env:
   BUILDER_VERSION: v0.8.12
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
-  PACKAGE_NAME: aws-iot-device-sdk-cpp-v2
+  PACKAGE_NAME: STAGING-aws-iot-device-sdk-cpp-v2
   LINUX_BASE_IMAGE: ubuntu-16-x64
   RUN: ${{ github.run_id }}-${{ github.run_number }}
 
@@ -23,71 +23,93 @@ jobs:
           - manylinux2014-x64
           - manylinux2014-x86
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
           export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
           docker pull $DOCKER_IMAGE
-          docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
 
   al2:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
           export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
           docker pull $DOCKER_IMAGE
-          docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
   clang-compat:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version: [3, 6, 8, 9]
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
           export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
           docker pull $DOCKER_IMAGE
-          docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
 
   gcc-compat:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version: [4.8, 5, 6, 7, 8]
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
           export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
           docker pull $DOCKER_IMAGE
-          docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
 
   byo-crypto:
     runs-on: ubuntu-latest
     steps:
-        # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
-    - name: Build ${{ env.PACKAGE_NAME }}
-      run: |
-        echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
-        export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
-        docker pull $DOCKER_IMAGE
-        docker run --env GITHUB_REF $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+      # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
+      - name: Build ${{ env.PACKAGE_NAME }}
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
+          export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
+          docker pull $DOCKER_IMAGE
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1
 
   windows-vs16:
     runs-on: windows-latest
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
-          md D:\a\work
-          cd D:\a\work
           python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
           python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
@@ -97,6 +119,10 @@ jobs:
       matrix:
         arch: [x86, x64]
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       - uses: ilammy/msvc-dev-cmd@v1
         with:
           toolset: 14.0
@@ -105,14 +131,16 @@ jobs:
           spectre: true
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
-          md D:\a\work
-          cd D:\a\work
           python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
           python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
   osx:
     runs-on: macos-latest
     steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
@@ -122,12 +150,12 @@ jobs:
   check-submodules:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout Source
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-        fetch-depth: 0
-    - name: Check Submodules
-      # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work
-      # https://github.com/actions/runner/issues/480
-      uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main
+      - name: Checkout Source
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+          fetch-depth: 0
+      - name: Check Submodules
+        # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work
+        # https://github.com/actions/runner/issues/480
+        uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "aws-common-runtime/aws-crt-cpp"]
+[submodule "crt/aws-crt-cpp"]
 	path = crt/aws-crt-cpp
 	url = https://github.com/awslabs/aws-crt-cpp.git
 [submodule "crt/aws-c-iot"]
diff --git a/builder.json b/builder.json
@@ -1,5 +1,5 @@
 {
-  "name": "aws-iot-device-sdk-cpp-v2",
+  "name": "STAGING-aws-iot-device-sdk-cpp-v2",
   "!cmake_args": [
     "-DPERFORM_HEADER_CHECK=OFF",
     "-DS2N_NO_PQ_ASM=ON"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[submodule "aws-common-runtime/aws-crt-cpp"]`
	`1`	`+[submodule "crt/aws-crt-cpp"]`
`2`	`2`	`path = crt/aws-crt-cpp`
`3`	`3`	`url = https://github.com/awslabs/aws-crt-cpp.git`
`4`	`4`	`[submodule "crt/aws-c-iot"]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "aws-iot-device-sdk-cpp-v2",`
	`2`	`+ "name": "STAGING-aws-iot-device-sdk-cpp-v2",`
`3`	`3`	`"!cmake_args": [`
`4`	`4`	`"-DPERFORM_HEADER_CHECK=OFF",`
`5`	`5`	`"-DS2N_NO_PQ_ASM=ON"`