Skip to content

CI and documentation generation adjustment #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ env:
CI_UTILS_FOLDER: "./aws-iot-device-sdk-python-v2/utils"
CI_SAMPLES_CFG_FOLDER: "./aws-iot-device-sdk-python-v2/.github/workflows"
CI_SAMPLES_FOLDER: "./aws-iot-device-sdk-python-v2/samples"
CI_PUBSUB_ROLE: ${{ secrets.AWS_CI_PUBSUB_ROLE }}
CI_COGNITO_ROLE: ${{ secrets.AWS_CI_COGNITO_ROLE }}
CI_X509_ROLE: ${{ secrets.AWS_CI_X509_ROLE }}
CI_CUSTOM_AUTHORIZER_ROLE: ${{ secrets.AWS_CI_CUSTOM_AUTHORIZER_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_MQTT5_ROLE: ${{ secrets.AWS_CI_MQTT5_ROLE }}
CI_PUBSUB_ROLE: arn:aws:iam::180635532705:role/CI_PubSub_Role
CI_COGNITO_ROLE: arn:aws:iam::180635532705:role/CI_Cognito_Role
CI_X509_ROLE: arn:aws:iam::180635532705:role/CI_X509_Role
CI_CUSTOM_AUTHORIZER_ROLE: arn:aws:iam::180635532705:role/CI_CustomAuthorizer_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_MQTT5_ROLE: arn:aws:iam::180635532705:role/CI_MQTT5_Role
CI_BUILD_AND_TEST_ROLE: arn:aws:iam::180635532705:role/V2_SDK_Unit_Testing

jobs:
Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/docs.yml

This file was deleted.

28 changes: 27 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true

- name: Make new release
env:
Expand All @@ -42,10 +43,35 @@ jobs:

./utils/publish-release.sh "${{ github.event.inputs.release_type }}" "$Title"

- name: Generate documentation
run: |
python3 -m pip install sphinx
python3 -m pip install --verbose .
./make-docs.py

- name: Commit documentation
run: |
git config --local user.email "[email protected]"
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/[email protected]
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

- name: configure AWS credentials (Release)
uses: aws-actions/configure-aws-credentials@v1
with:
role-to-assume: ${{ secrets.AWS_CI_RELEASE_ROLE }}
role-to-assume: arn:aws:iam::180635532705:role/CI_V2_RELEASE_S3_ROLE
aws-region: us-east-1

- name: "Create VERSION file and trigger release"
Expand Down