Skip to content
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.

Sign up for GitHub

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

Jump to bottom

CI and documentation generation adjustment #383

Merged
merged 6 commits into from
Mar 23, 2023
Merged

CI and documentation generation adjustment #383

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7251257
Use ARNs directly instead of via secrets
TwistedTwigleg Mar 22, 2023
e3f9dec
Only push documentation to docs branch on release
TwistedTwigleg Mar 22, 2023
399e063
YAML formatting is fun
TwistedTwigleg Mar 22, 2023
96d0654
Consistency with other SDK PRs
TwistedTwigleg Mar 22, 2023
8adf9ed
Do not pull submodules if they are not needed
TwistedTwigleg Mar 23, 2023
0259301
Fix release script
TwistedTwigleg Mar 23, 2023
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
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ env:
DA_SHADOW_PROPERTY: datest
DA_SHADOW_VALUE_SET: ON
DA_SHADOW_VALUE_DEFAULT: OFF
CI_IOT_CONTAINERS: ${{ secrets.AWS_CI_IOT_CONTAINERS }}
CI_PUBSUB_ROLE: ${{ secrets.AWS_CI_PUBSUB_ROLE }}
CI_COGNITO_ROLE: ${{ secrets.AWS_CI_COGNITO_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_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_COGNITO_ROLE: arn:aws:iam::180635532705:role/CI_Cognito_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_X509_ROLE: arn:aws:iam::180635532705:role/CI_X509_Role
CI_MQTT5_ROLE: arn:aws:iam::180635532705:role/CI_MQTT5_Role

jobs:
linux-compat:
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/docs.yml
View file
Open in desktop

This file was deleted.

27 changes: 26 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
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,34 @@ jobs:

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

- name: Generate documentation
run: |
mvn install -Dmaven.test.skip
./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

- 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