diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 697137f45..387dfd70b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,19 +22,19 @@ env: CI_FOLDER: "D:/a/work" CI_UTILS_FOLDER: "./aws-iot-device-sdk-cpp-v2/utils" CI_SAMPLES_CFG_FOLDER: "./aws-iot-device-sdk-cpp-v2/.github/workflows" - CI_IOT_CONTAINERS: ${{ secrets.AWS_CI_IOT_CONTAINERS }} - CI_PUBSUB_ROLE: ${{ secrets.AWS_CI_PUBSUB_ROLE }} - CI_CYCLEPUBSUB_ROLE: ${{ secrets.AWS_CI_CYCLEPUBSUB_ROLE }} - CI_CUSTOM_AUTHORIZER_ROLE: ${{ secrets.AWS_CI_CUSTOM_AUTHORIZER_ROLE }} - CI_COGNITO_ROLE: ${{ secrets.AWS_CI_COGNITO_ROLE }} - CI_SHADOW_ROLE: ${{ secrets.AWS_CI_SHADOW_ROLE }} - CI_JOBS_ROLE: ${{ secrets.AWS_CI_JOBS_ROLE }} - CI_FLEET_PROVISIONING_ROLE: ${{ secrets.AWS_CI_FLEET_PROVISIONING_ROLE }} - CI_DEVICE_ADVISOR: ${{ secrets.AWS_CI_DEVICE_ADVISOR_ROLE }} - CI_DEVICE_DEFENDER: ${{ secrets.AWS_CI_DEVICE_DEFENDER_ROLE }} - CI_SECURE_TUNNEL: ${{ secrets.AWS_CI_SECURE_TUNNEL_ROLE }} - CI_X509_ROLE: ${{ secrets.AWS_CI_X509_ROLE }} - CI_MQTT5_ROLE: ${{ secrets.AWS_CI_MQTT5_ROLE }} + CI_IOT_CONTAINERS: arn:aws:iam::123124136734:role/CRT_IoT_Containers + CI_PUBSUB_ROLE: arn:aws:iam::180635532705:role/CI_PubSub_Role + CI_CYCLEPUBSUB_ROLE: arn:aws:iam::180635532705:role/CI_CyclePubSub_Role + CI_CUSTOM_AUTHORIZER_ROLE: arn:aws:iam::180635532705:role/CI_CustomAuthorizer_Role + CI_COGNITO_ROLE: arn:aws:iam::180635532705:role/CI_Cognito_Role + CI_SHADOW_ROLE: arn:aws:iam::180635532705:role/CI_Shadow_Role + CI_JOBS_ROLE: arn:aws:iam::180635532705:role/CI_Jobs_Role + CI_FLEET_PROVISIONING_ROLE: arn:aws:iam::180635532705:role/service-role/CI_FleetProvisioning_Role + CI_DEVICE_ADVISOR: arn:aws:iam::180635532705:role/CI_DeviceAdvisor_Role + CI_DEVICE_DEFENDER: arn:aws:iam::180635532705:role/CI_DeviceDefender_Role + CI_SECURE_TUNNEL: arn:aws:iam::180635532705:role/CI_SecureTunnel_Role + CI_X509_ROLE: arn:aws:iam::180635532705:role/CI_X509_Role + CI_MQTT5_ROLE: arn:aws:iam::180635532705:role/CI_MQTT5_Role jobs: linux-compat: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 0af26a5a4..000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Update the API documentation whenever the `main` branch changes. -# This documentation lives in its own `docs` branch. -name: docs - -on: - push: - branches: - - 'main' - -jobs: - update-docs-branch: - runs-on: ubuntu-20.04 # latest - permissions: - contents: write # allow push - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: recursive - - - name: Update docs branch - run: | - echo "Compiling and installing doxygen 1.8.20 from source" - sudo apt-get install -y llvm-11 llvm-11-dev clang-11 libclang-11-dev - git clone https://github.com/doxygen/doxygen.git -b Release_1_8_20 - cd doxygen - mkdir build - cd build - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. - sudo make -j 4 - sudo make install - cd ../.. - echo "Finished compiling and installing Doxygen" - - version=$(cat ./VERSION) - echo "Updating documentation version to ${version//v}" - sed -i -r -e "s/PROJECT_NUMBER = .*$PARTITION_COLUMN.*/PROJECT_NUMBER = ${version//v}/" docsrc/doxygen.config - echo "Finished updating documentation version to ${version//v}" - - ./make-docs.py - - - name: Commit - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git add --force docs/ - git commit --message="update docs" - - - name: Push to docs branch - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ github.token }} - branch: docs - # Force push so that `docs` branch always looks like `main`, - # but with 1 additional "update docs" commit. - # This seems simpler than trying to cleanly merge `main` into - # `docs` each time. - force: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5661b6050..a46a68a5b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - name: Make new release env: @@ -40,3 +41,43 @@ jobs: Title=$(echo ${Title//[\$]}) ./utils/publish-release.sh "${{ github.event.inputs.release_type }}" "$Title" + + - name: Generate documentation + run: | + echo "Compiling and installing doxygen 1.8.20 from source" + sudo apt-get install -y llvm-11 llvm-11-dev clang-11 libclang-11-dev + git clone https://github.com/doxygen/doxygen.git -b Release_1_8_20 + cd doxygen + mkdir build + cd build + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. + sudo make -j 4 + sudo make install + cd ../.. + echo "Finished compiling and installing Doxygen" + + version=$(cat ./VERSION) + echo "Updating documentation version to ${version//v}" + sed -i -r -e "s/PROJECT_NUMBER = .*$PARTITION_COLUMN.*/PROJECT_NUMBER = ${version//v}/" docsrc/doxygen.config + echo "Finished updating documentation version to ${version//v}" + + ./make-docs.py + + - name: Commit documentation + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git add --force docs/ + current_version=$(git describe --tags --abbrev=0) + git commit --message="Update Docs: ${current_version}" + + - name: Push generated documentation to docs branch + uses: ad-m/github-push-action@v0.6.0 + with: + github_token: ${{ github.token }} + branch: docs + # Force push so that `docs` branch always looks like `main`, + # but with 1 additional "update docs" commit. + # This seems simpler than trying to cleanly merge `main` into + # `docs` each time. + force: true