Skip to content

Commit 15bd590

Browse files
committed
Merge branch 'release/3.1.4'
2 parents 9471e21 + bbeed79 commit 15bd590

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1861
-1938
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,9 @@ on:
1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
17-
env:
18-
SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
1917

2018
steps:
21-
- uses: actions/checkout@v3
22-
with:
23-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
24-
25-
- name: Read properties from package.json
26-
id: package_json
27-
uses: zoexx/github-action-json-file-properties@1.0.4
28-
with:
29-
file_path: package.json
30-
31-
- uses: actions/setup-node@v3
32-
with:
33-
node-version: 20
34-
cache: npm
35-
36-
- run: npm install
37-
- run: npm run lint
38-
- run: npm run test:coverage
39-
- run: npm run build
40-
- uses: SonarSource/sonarcloud-github-action@master
41-
if: env.SONARCLOUD_TOKEN != null
42-
env:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
SONAR_TOKEN: ${{ env.SONARCLOUD_TOKEN }}
45-
with:
46-
args: -Dsonar.projectVersion=${{steps.package_json.outputs.version}}
19+
- uses: brdgm/github-action-build@v1
20+
with:
21+
sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
22+
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,17 @@ on:
77
workflow_dispatch:
88

99
jobs:
10-
build:
10+
deploy:
1111
runs-on: ubuntu-latest
1212
environment:
1313
name: Production
14-
url: "https://brdgm.me/${{ steps.package_json.outputs.appDeployName }}"
14+
url: "https://brdgm.me/${{ steps.deploy.outputs.app-deploy-name }}"
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
19-
- name: Read properties from package.json
20-
id: package_json
21-
uses: zoexx/github-action-json-file-properties@1.0.4
22-
with:
23-
file_path: package.json
24-
25-
- uses: actions/setup-node@v3
26-
with:
27-
node-version: 20
28-
cache: npm
29-
30-
- run: npm install
31-
- run: npm run test:unit
32-
- run: npm run build
33-
34-
- name: Copy to Site
35-
uses: cpina/github-action-push-to-another-repository@v1.7.2
36-
env:
37-
API_TOKEN_GITHUB: ${{ secrets.GH_SITE_DEPLOY_PAT }}
38-
with:
39-
source-directory: dist
40-
destination-repository-username: brdgm
41-
destination-repository-name: brdgm.github.io
42-
destination-github-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
43-
user-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
44-
user-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
45-
target-branch: main
46-
commit-message: deploy ${{ steps.package_json.outputs.appDeployName }} ${{ steps.package_json.outputs.version }}
47-
target-directory: ${{ steps.package_json.outputs.appDeployName }}
17+
- uses: brdgm/github-action-deploy@v1
18+
id: deploy
19+
with:
20+
gh-site-deploy-pat: ${{ secrets.GH_SITE_DEPLOY_PAT }}
21+
gh-site-deploy-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
22+
gh-site-deploy-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
23+
gh-site-deploy-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}

.github/workflows/release-from-tag.yml

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

.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Release and Deploy
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
release:
8+
runs-on: ubuntu-latest
9+
environment:
10+
name: Production
11+
url: "https://brdgm.me/${{ steps.release.outputs.app-deploy-name }}"
12+
13+
permissions:
14+
contents: write
15+
16+
steps:
17+
- uses: brdgm/github-action-release@v1
18+
id: release
19+
with:
20+
github-token: ${{ secrets.GITHUB_TOKEN }}
21+
gh-site-deploy-pat: ${{ secrets.GH_SITE_DEPLOY_PAT }}
22+
gh-site-deploy-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
23+
gh-site-deploy-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
24+
gh-site-deploy-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}

0 commit comments

Comments
 (0)