Skip to content

Commit f653c06

Browse files
dreamorosidreamorosi
authored
fix(layers): release process + remove duplicate code (#1052)
* fix: release process * chore: remove duplicate code * Update .github/workflows/reusable-publish-docs.yml
1 parent d48c1f8 commit f653c06

File tree

8 files changed

+299
-378
lines changed

8 files changed

+299
-378
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
### Related issues, RFCs
2323

24-
<!--- Add here the number to the Github Issue or RFC that is related to this PR. -->
25-
<!-- **Issue number:** #123 -->
24+
<!--- Add here the number (i.e. #42) to the Github Issue or RFC that is related to this PR. -->
25+
<!--- If no issue is present the PR might get blocked and not be reviewed. -->
2626
**Issue number:**
2727

2828
### PR status

‎.github/workflows/auto-merge.yml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎.github/workflows/make-release.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Make Release
2+
on:
3+
workflow_dispatch: {}
4+
concurrency:
5+
group: on-release-publish
6+
jobs:
7+
run-unit-tests:
8+
uses: ./.github/workflows/reusable-run-unit-tests.yml
9+
publish-npm:
10+
needs: run-unit-tests
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v3
15+
with:
16+
# Here `token` is needed to avoid incurring in error GH006 Protected Branch Update Failed,
17+
token: ${{ secrets.GH_PUBLISH_TOKEN }}
18+
# While `fetch-depth` is used to allow the workflow to later commit & push the changes.
19+
fetch-depth: 0
20+
- name: Setup NodeJS
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: "16"
24+
cache: "npm"
25+
- name: Setup npm
26+
run: |
27+
npm i -g npm@next-8
28+
npm set "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}"
29+
- name: Cache node modules
30+
id: cache-node-modules
31+
uses: actions/cache@v3
32+
with:
33+
path: "./node_modules"
34+
# Use the combo between node version, name, and SHA-256 hash of the lock file as cache key so that
35+
# if one of them changes the cache is invalidated/discarded
36+
key: 16-cache-utils-node-modules-${{ hashFiles('./package-lock.json') }}
37+
- name: Build packages
38+
run: |
39+
npm run build -w packages/commons
40+
npm run build -w packages/logger & npm run build -w packages/tracer & npm run build -w packages/metrics
41+
- name: "Version and publish"
42+
env:
43+
GH_TOKEN: ${{ secrets.GH_PUBLISH_TOKEN }}
44+
run: |
45+
git config --global user.name 'github-actions[bot]'
46+
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
47+
git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY
48+
npx lerna version --conventional-commits --force-publish --yes
49+
npx lerna publish from-git --no-verify-access --yes
50+
publish:
51+
needs: publish-npm
52+
uses: ./.github/workflows/reusable-publish-docs.yml
53+
with:
54+
workflow_origin: ${{ github.event.repository.full_name }}
55+
isRelease: "true"
56+
secrets:
57+
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/on-merge-to-main.yml‎

Lines changed: 24 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
workflows: ["Record PR details"]
66
types:
77
- completed
8+
concurrency:
9+
group: on-merge-to-main
810

911
jobs:
1012
get_pr_details:
@@ -15,10 +17,30 @@ jobs:
1517
workflow_origin: ${{ github.event.repository.full_name }}
1618
secrets:
1719
token: ${{ secrets.GITHUB_TOKEN }}
20+
run-unit-tests:
21+
uses: ./.github/workflows/reusable-run-unit-tests.yml
22+
publish:
23+
needs:
24+
[get_pr_details, run-unit-tests, check-examples, check-layer-publisher]
25+
uses: ./.github/workflows/reusable-publish-docs.yml
26+
with:
27+
workflow_origin: ${{ github.event.repository.full_name }}
28+
prIsMerged: ${{ needs.get_pr_details.outputs.prIsMerged }}
29+
secrets:
30+
token: ${{ secrets.GITHUB_TOKEN }}
31+
update-release-draft:
32+
needs: publish
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v3
37+
- name: Update release draft
38+
uses: release-drafter/[email protected]
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1841
release_label_on_merge:
19-
needs: get_pr_details
42+
needs: [get_pr_details, update-release-draft]
2043
runs-on: ubuntu-latest
21-
if: needs.get_pr_details.outputs.prIsMerged == 'true'
2244
steps:
2345
- uses: actions/checkout@v3
2446
- name: "Label PR related issue for release"
@@ -33,98 +55,3 @@ jobs:
3355
script: |
3456
const script = require('.github/scripts/label_related_issue.js')
3557
await script({github, context, core})
36-
publish:
37-
#########################
38-
# Force Github action to run only a single job at a time (based on the group name)
39-
# This is to prevent "race-condition" in publishing a new version of doc to `gh-pages` (#365)
40-
#########################
41-
concurrency:
42-
group: on-merge-to-main
43-
runs-on: ubuntu-latest
44-
steps:
45-
- name: "Checkout"
46-
uses: actions/checkout@v3
47-
with:
48-
fetch-depth: 0
49-
#########################
50-
# Release new version
51-
#########################
52-
- name: "Use NodeJS 16"
53-
uses: actions/setup-node@v3
54-
with:
55-
node-version: '16'
56-
- name: Install [email protected]
57-
run: npm i -g npm@next-8
58-
- name: "Setup npm"
59-
run: |
60-
npm set "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}"
61-
- name: Install monorepo packages
62-
# This installs all the dependencies of ./packages/*
63-
# See https://github.com/npm/cli/issues/4475 to see why --foreground-scripts
64-
run: npm ci --foreground-scripts
65-
- name: Install CDK example packages
66-
# Since we are not managing the CDK examples with npm workspaces we install
67-
# the dependencies in a separate step
68-
working-directory: ./examples/cdk
69-
run: npm ci
70-
- name: Install Layer publisher app
71-
working-directory: ./layer-publisher
72-
run: npm ci
73-
- name: "Setup SAM"
74-
# We use an ad-hoc action so we can specify the SAM CLI version
75-
uses: aws-actions/setup-sam@v2
76-
with:
77-
version: 1.49.0
78-
- name: Install SAM example packages
79-
# Since we are not managing the SAM examples with npm workspaces we install
80-
# the dependencies in a separate step
81-
working-directory: ./examples/sam
82-
run: npm ci
83-
- name: Run lint
84-
run: npm run lerna-lint
85-
- name: Run tests
86-
run: npm run lerna-test
87-
- name: Update release draft
88-
uses: release-drafter/[email protected]
89-
env:
90-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91-
#########################
92-
# Generate documentation
93-
#########################
94-
- name: Set up Python
95-
uses: actions/setup-python@v4
96-
with:
97-
python-version: '3.8'
98-
- name: Install doc generation dependencies
99-
run: |
100-
pip install --upgrade pip
101-
pip install -r docs/requirements.txt
102-
- name: Setup doc deploy
103-
run: |
104-
git config --global user.name Docs deploy
105-
git config --global user.email [email protected]
106-
- name: Build mkdocs site in "gh-pages" branch and push
107-
run: |
108-
rm -rf site
109-
VERSION="dev"
110-
echo "Publishing doc for version: $VERSION"
111-
mkdocs build
112-
mike deploy --push "$VERSION"
113-
- name: Build API docs
114-
run: |
115-
rm -rf api
116-
npm run docs-generateApiDoc
117-
- name: Release API docs to the released version
118-
uses: peaceiris/actions-gh-pages@v3
119-
with:
120-
github_token: ${{ secrets.GITHUB_TOKEN }}
121-
publish_dir: ./api
122-
keep_files: true
123-
destination_dir: dev/api
124-
- name: Release API docs to the "latest" version
125-
uses: peaceiris/actions-gh-pages@v3
126-
with:
127-
github_token: ${{ secrets.GITHUB_TOKEN }}
128-
publish_dir: ./api
129-
keep_files: true
130-
destination_dir: latest/api

‎.github/workflows/on-release-prod.yml‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)