Skip to content

Commit 282565a

Browse files
ansidevansidev
authored
Merge pull request #151 from ansidev/release/2.2.5
Release v2.2.5
2 parents 07a46bc + 814b2b0 commit 282565a

11 files changed

+408
-559
lines changed

‎.changes/v2.2.5.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
## [v2.2.5](https://github.com/ansidev/leetcode-blog/compare/v2.2.4...v2.2.5) (2023-06-13)
2+
3+
### Bug Fixes
4+
5+
- **github-workflow:** wrong github environment url
6+
7+
### Code Refactoring
8+
9+
- **github-workflow:** apply GitHub Actions from ghacts
10+
11+
- **github-workflow:** apply GitHub Actions from ghacts/gitflow
12+
13+
### Dependencies
14+
15+
| Package | Version |
16+
| ---------------------------------- | ------------------------- |
17+
| `@astrojs/sitemap` | `^1.3.2` `->` `^1.3.3` |
18+
| `astro` | `^2.5.6` `->` `2.6.3` |
19+
| `astro-compress` | `^1.1.46` `->` `^1.1.47` |
20+
| `@fontsource/ibm-plex-mono` | `^5.0.2` `->` `^5.0.3` |
21+
| `@iconify-json/bi` | `^1.1.16` `->` `^1.1.17` |
22+
| `@typescript-eslint/eslint-plugin` | `^5.59.8` `->` `^5.59.11` |
23+
| `@typescript-eslint/parser` | `^5.59.8` `->` `^5.59.11` |
24+
| `dayjs` | `^1.11.7` `->` `^1.11.8` |
25+
| `dotenv` | `^16.1.1` `->` `^16.1.4` |
26+
| `eslint` | `^8.41.0` `->` `^8.42.0` |
27+
| `sass` | `^1.62.1` `->` `^1.63.3` |
28+
| `satori` | `^0.9.1` `->` `^0.10.1` |
29+
| `typescript` | `^5.0.4` `->` `^5.1.3` |
30+
31+
Full Changelog: [v2.2.4...v2.2.5](https://github.com/ansidev/leetcode-blog/compare/v2.2.4...v2.2.5)

‎.github/workflows/auto_merge_release_hotfix_into_develop.yaml

-40
This file was deleted.

‎.github/workflows/create_release_pr.yaml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: create_release_pr
2+
3+
on:
4+
push:
5+
branches:
6+
- "release/**"
7+
- "hotfix/**"
8+
9+
jobs:
10+
create_release_pr:
11+
name: Create release pull request
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
# only create draft pull requests on
16+
# pushing to branches 'release/' or 'hotfix/'
17+
if: |
18+
startsWith(github.ref_name, 'release/') ||
19+
startsWith(github.ref_name, 'hotfix/')
20+
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v3
24+
with:
25+
ref: ${{ github.ref_name }}
26+
token: ${{ secrets.GH_TOKEN }}
27+
# needed by "gh pr create"
28+
fetch-depth: 0
29+
30+
- name: Set release type as release
31+
if: startsWith(github.ref_name, 'release/')
32+
run: echo "RELEASE_TYPE=release" >> "$GITHUB_ENV"
33+
34+
- name: Set release type as hotfix
35+
if: startsWith(github.ref_name, 'hotfix/')
36+
run: echo "RELEASE_TYPE=hotfix" >> "$GITHUB_ENV"
37+
38+
- name: Create release pull request
39+
uses: ghacts/gitflow/create-release-pr@main
40+
with:
41+
token: ${{ secrets.GH_TOKEN }}
42+
release-type: ${{ env.RELEASE_TYPE }}
43+
release-branch-prefix: '${{ env.RELEASE_TYPE }}/'

‎.github/workflows/deploy_to_netlify.yaml

+27-120
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
env:
1414
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
1515
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
16+
NETLIFY_SITE_NAME: ${{ vars.NETLIFY_SITE_NAME }}
1617
DEPLOY_DIR: dist
1718

1819
jobs:
@@ -80,140 +81,46 @@ jobs:
8081
needs: set_deploy_environment
8182
environment:
8283
name: ${{ needs.set_deploy_environment.outputs.github_environment }}
83-
url: ${{ steps.post_deploy.outputs.netlify_deploy_url }}
84+
url: ${{ steps.deploy.outputs.netlify-deploy-url }}
8485
runs-on: ubuntu-latest
8586
steps:
86-
- name: Checkout repository
87-
uses: actions/checkout@v3
88-
89-
- name: Setup Node
90-
uses: actions/setup-node@v3
91-
with:
92-
node-version: 18
93-
94-
- name: Setup PNPM
95-
uses: pnpm/action-setup@v2
96-
with:
97-
version: 8
98-
run_install: false
99-
100-
- name: Get PNPM store directory
101-
id: pnpm-cache
102-
run: echo "pnpm_store_path=$(pnpm store path)" >> "$GITHUB_OUTPUT"
103-
104-
- name: Setup pnpm cache
105-
uses: actions/cache@v3
106-
with:
107-
path: ${{ steps.pnpm-cache.outputs.pnpm_store_path }}
108-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
109-
restore-keys: |
110-
${{ runner.os }}-pnpm-store-
111-
112-
- name: Install dependencies
113-
run: pnpm install
114-
115-
- name: Install Netlify CLI
116-
run: pnpm add --save-dev netlify-cli
117-
118-
- name: Set as production environment
119-
if: needs.set_deploy_environment.outputs.github_environment == 'production'
120-
run: echo "PROD=true" >> "$GITHUB_ENV"
121-
122-
- name: Deploy ${{ needs.set_deploy_environment.outputs.github_environment }}
123-
id: deploy
124-
if: success()
87+
- name: Set app environment variables
12588
env:
12689
NETLIFY_DEPLOY_PREFIX: ${{ needs.set_deploy_environment.outputs.netlify_deploy_prefix }}
12790
NETLIFY_DEPLOY_ALIAS: ${{ needs.set_deploy_environment.outputs.netlify_deploy_alias }}
12891
SITE_GA_ID: ${{ vars.SITE_GA_ID }}
12992
SITE_SWETRIX_ID: ${{ vars.SITE_SWETRIX_ID }}
13093
SITE_COUNTER_ANALYTICS_ID: ${{ vars.SITE_COUNTER_ANALYTICS_ID }}
13194
SITE_DISQUS_ID: ${{ vars.SITE_DISQUS_ID }}
132-
shell: bash
13395
run: |
134-
set -e
135-
([[ ${PROD:-false} == "true" ]] && \
136-
OUTPUT=$(GA_ID=$SITE_GA_ID \
137-
SWETRIX_ID="${SITE_SWETRIX_ID}" \
138-
COUNTER_ANALYTICS_ID="${SITE_COUNTER_ANALYTICS_ID}" \
139-
DISQUS_ID="${SITE_DISQUS_ID}" \
140-
pnpm netlify deploy \
141-
--auth ${{ env.NETLIFY_AUTH_TOKEN }} \
142-
--site ${{ env.NETLIFY_SITE_ID }} \
143-
--json \
144-
--build \
145-
--context production \
146-
--message "$(git log -1 --pretty=%s)" \
147-
--prod \
148-
| tr '\n' ' ')) || \
149-
OUTPUT=$(
150-
SWETRIX_ID="${SITE_SWETRIX_ID}" \
151-
COUNTER_ANALYTICS_ID="${SITE_COUNTER_ANALYTICS_ID}" \
152-
DISQUS_ID="${SITE_DISQUS_ID}" \
153-
pnpm netlify deploy \
154-
--auth ${{ env.NETLIFY_AUTH_TOKEN }} \
155-
--site ${{ env.NETLIFY_SITE_ID }} \
156-
--json \
157-
--build \
158-
--context deploy-preview \
159-
--alias "${NETLIFY_DEPLOY_ALIAS}" \
160-
--message "$(git log -1 --pretty=%s)" \
161-
| tr '\n' ' ')
162-
set +e
163-
164-
NETLIFY_OUTPUT="$OUTPUT"
96+
{
97+
echo "ASTRO_BASE_URL=https://${NETLIFY_DEPLOY_PREFIX}${NETLIFY_SITE_NAME}.netlify.app"
98+
echo "NETLIFY_DEPLOY_ALIAS=${NETLIFY_DEPLOY_ALIAS}"
99+
echo "GA_ID=${SITE_GA_ID}"
100+
echo "SWETRIX_ID=${SITE_SWETRIX_ID}"
101+
echo "COUNTER_ANALYTICS_ID=${SITE_COUNTER_ANALYTICS_ID}"
102+
echo "DISQUS_ID=${SITE_DISQUS_ID}"
103+
} >> "$GITHUB_ENV"
165104
166-
echo "netlify_output=$NETLIFY_OUTPUT" >> "$GITHUB_OUTPUT"
167-
echo "success=true" >> "$GITHUB_OUTPUT"
105+
- name: Build
106+
uses: ghacts/static-site@main
107+
with:
108+
node-version: 18
109+
skip-test: true
110+
lint-script: "lint:js"
168111

169-
- name: Post deploy ${{ needs.set_deploy_environment.outputs.github_environment }}
170-
id: post_deploy
171-
if: success()
112+
- name: Deploy
113+
id: deploy
114+
uses: ghacts/manual-deploy-to-netlify@main
172115
env:
173-
NETLIFY_DRAFT_URL: ${{ fromJson(steps.deploy.outputs.netlify_output).deploy_url }}
174-
NETLIFY_PROD_URL: ${{ fromJson(steps.deploy.outputs.netlify_output).url }}
175-
run: |
176-
[[ ${PROD:-false} == "true" ]] && \
177-
echo "netlify_deploy_url=$NETLIFY_PROD_URL" >> "$GITHUB_OUTPUT" || \
178-
echo "netlify_deploy_url=$NETLIFY_DRAFT_URL" >> "$GITHUB_OUTPUT"
116+
PROD: ${{ needs.set_deploy_environment.outputs.github_environment == 'production' }}
117+
with:
118+
auth-token: ${{ env.NETLIFY_AUTH_TOKEN }}
119+
site-id: ${{ env.NETLIFY_SITE_ID }}
120+
dir: ${{ env.DEPLOY_DIR }}
121+
alias: ${{ env.NETLIFY_DEPLOY_ALIAS }}
122+
prod: ${{ env.PROD }}
179123

180-
- name: Debug deploy ${{ needs.set_deploy_environment.outputs.github_environment }}
181-
id: debug-deploy
182-
if: always() && (steps.deploy.outcome == 'failure' || steps.post_deploy.outcome == 'failure' )
183-
env:
184-
NETLIFY_DEPLOY_PREFIX: ${{ needs.set_deploy_environment.outputs.netlify_deploy_prefix }}
185-
NETLIFY_DEPLOY_ALIAS: ${{ needs.set_deploy_environment.outputs.netlify_deploy_alias }}
186-
SITE_GA_ID: ${{ vars.SITE_GA_ID }}
187-
SITE_SWETRIX_ID: ${{ vars.SITE_SWETRIX_ID }}
188-
SITE_COUNTER_ANALYTICS_ID: ${{ vars.SITE_COUNTER_ANALYTICS_ID }}
189-
SITE_DISQUS_ID: ${{ vars.SITE_DISQUS_ID }}
190-
shell: bash
191-
run: |
192-
echo "node version $(node -v)"
193-
echo "pnpm version $(pnpm -v)"
194-
([[ ${PROD:-false} == "true" ]] && \
195-
GA_ID=$SITE_GA_ID \
196-
SWETRIX_ID="${SITE_SWETRIX_ID}" \
197-
COUNTER_ANALYTICS_ID="${SITE_COUNTER_ANALYTICS_ID}" \
198-
DISQUS_ID="${SITE_DISQUS_ID}" \
199-
pnpm netlify deploy \
200-
--auth ${{ env.NETLIFY_AUTH_TOKEN }} \
201-
--site ${{ env.NETLIFY_SITE_ID }} \
202-
--build \
203-
--context production \
204-
--message "$(git log -1 --pretty=%s)" \
205-
--prod) || \
206-
GA_ID=$SITE_GA_ID \
207-
SWETRIX_ID="${SITE_SWETRIX_ID}" \
208-
COUNTER_ANALYTICS_ID="${SITE_COUNTER_ANALYTICS_ID}" \
209-
DISQUS_ID="${SITE_DISQUS_ID}" \
210-
pnpm netlify deploy \
211-
--auth ${{ env.NETLIFY_AUTH_TOKEN }} \
212-
--site ${{ env.NETLIFY_SITE_ID }} \
213-
--build \
214-
--context deploy-preview \
215-
--alias "${NETLIFY_DEPLOY_ALIAS}" \
216-
--message "$(git log -1 --pretty=%s)"
217124
outputs:
218125
success: ${{ steps.deploy.outputs.success }}
219126

‎.github/workflows/draft_release_hotfix_pr.yaml

-86
This file was deleted.

0 commit comments

Comments
 (0)