Skip to content

Commit

Permalink
Merge branch 'release/1.1.16'
Browse files Browse the repository at this point in the history
  • Loading branch information
web-flow committed May 3, 2024
2 parents 5c0a8c7 + e1627c0 commit 7e8da4e
Show file tree
Hide file tree
Showing 20 changed files with 1,898 additions and 1,811 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ jobs:
SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Read properties from package.json
id: package_json
uses: zoexx/[email protected].4
uses: zoexx/[email protected].6
with:
file_path: package.json

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm

- run: npm install
- run: npm ci
- run: npm run lint
- run: npm run test:coverage
- run: npm run build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
url: "https://brdgm.me/${{ steps.package_json.outputs.appDeployName }}"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Read properties from package.json
id: package_json
uses: zoexx/[email protected].4
uses: zoexx/[email protected].6
with:
file_path: package.json

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm

- run: npm install
- run: npm ci
- run: npm run test:unit
- run: npm run build

Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/gitflow-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: GitFlow Release

on:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
environment:
name: Production
url: "https://brdgm.me/${{ steps.package_json.outputs.appDeployName }}"

permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm

- run: npm ci
- run: npm run test:unit
- run: npm run build

- name: Read properties from package.json
id: package_json
uses: zoexx/[email protected]
with:
file_path: package.json

- name: set git config
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- name: Install git flow extensions
run: |
sudo apt-get install git-flow
- run: git flow init --defaults
- run: git flow release start ${{ steps.package_json.outputs.version }}
- run: git flow release finish ${{ steps.package_json.outputs.version }} --push --message "Release"

- name: Copy to Site
uses: cpina/[email protected]
env:
API_TOKEN_GITHUB: ${{ secrets.GH_SITE_DEPLOY_PAT }}
with:
source-directory: dist
destination-repository-username: brdgm
destination-repository-name: brdgm.github.io
destination-github-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
user-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
user-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
target-branch: main
commit-message: deploy ${{ steps.package_json.outputs.appDeployName }} ${{ steps.package_json.outputs.version }}
target-directory: ${{ steps.package_json.outputs.appDeployName }}

- name: set next version
run: |
npm --no-git-tag-version version patch
git config user.name "GitHub Actions"
git config user.email [email protected]
git add package.json package-lock.json
git commit --message "set next version"
git push
- uses: ncipollo/release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ steps.package_json.outputs.version }}
generateReleaseNotes: true
18 changes: 0 additions & 18 deletions .github/workflows/release-from-tag.yml

This file was deleted.

Loading

0 comments on commit 7e8da4e

Please sign in to comment.