Skip to content

Commit

Permalink
Merge branch 'develop' into 'release'
Browse files Browse the repository at this point in the history
Merge branch 'develop' into 'release'

See merge request passbolt/passbolt-browser-extension!620
  • Loading branch information
cedricalfonsi committed Sep 20, 2023
2 parents cedf35f + a056c7b commit 8796140
Show file tree
Hide file tree
Showing 136 changed files with 4,456 additions and 1,128 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Create Release

on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"

jobs:
build:
name: Create release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
name: Create Release
run: gh release create "${GITHUB_REF#refs/*/}" -t "${GITHUB_REF#refs/*/}" --notes-file RELEASE_NOTES.md
17 changes: 17 additions & 0 deletions .github/workflows/release_candidate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Create Release Candidate

on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"

jobs:
build:
name: Create release candidate
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
name: Create Release candidate
run: gh release create "${GITHUB_REF#refs/*/}" -t "${GITHUB_REF#refs/*/}" -p --notes-file RELEASE_NOTES.md
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ stages:
- test
- build
- review
- release
- publish

.rules:
Expand All @@ -17,3 +18,4 @@ include:
- local: "/.gitlab-ci/jobs/test.yml"
- local: "/.gitlab-ci/jobs/review.yml"
- local: "/.gitlab-ci/jobs/publish.yml"
- local: ".gitlab-ci/jobs/release.yml"
21 changes: 21 additions & 0 deletions .gitlab-ci/jobs/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
release_notes:
image: registry.gitlab.com/gitlab-org/release-cli:latest
release:
description: "./RELEASE_NOTES.md"
tag_name: $CI_COMMIT_TAG
rules:
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
when: on_success
script: echo "Creating relase notes for $CI_COMMIT_TAG"
stage: release

release_notes_candidate:
image: registry.gitlab.com/gitlab-org/release-cli:latest
release:
tag_name: $CI_COMMIT_TAG
description: $CI_COMMIT_TAG
rules:
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/'
when: on_success
script: echo "Creating relase notes for $CI_COMMIT_TAG"
stage: release
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ module.exports = function (grunt) {
// Third party logos
nonull: true,
cwd: path.node_modules + 'passbolt-styleguide/src/img/third_party',
src: ['ChromeWebStore.png', 'gnupg_logo.png', 'gnupg_logo_disabled.png', 'appstore.svg', 'playstore.svg', 'windowsstore.svg'],
src: ['ChromeWebStore.png', 'gnupg_logo.png', 'gnupg_logo_disabled.png', 'appstore.svg', 'playstore.svg'],
dest: path.build_web_accessible_resources + 'img/third_party',
expand: true
}, {
Expand Down
File renamed without changes.
Loading

0 comments on commit 8796140

Please sign in to comment.