Skip to content

Commit

Permalink
Merge branch 'InseeFrLab-main' into pull
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonworr committed Jan 18, 2022
2 parents c2fc77c + db17c33 commit 2770102
Show file tree
Hide file tree
Showing 19 changed files with 719 additions and 275 deletions.
36 changes: 22 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
PACKAGE_MANAGER=yarn
fi
$PACKAGE_MANAGER run format:check
test:
runs-on: macos-10.15
needs: test_formatting
Expand All @@ -33,7 +32,7 @@ jobs:
steps:
- name: Tell if project is using npm or yarn
id: step1
uses: garronej/github_actions_toolkit@v2.2
uses: garronej/ts-ci@v1.1.3
with:
action_name: tell_if_project_uses_npm_or_yarn
- uses: actions/checkout@v2.3.4
Expand All @@ -51,38 +50,42 @@ jobs:
npm test
check_if_version_upgraded:
name: Check if version upgrade
if: github.event_name == 'push'
# We run this only if it's a push on the default branch or if it's a PR from a
# branch (meaning not a PR from a fork). It would be more straightforward to test if secrets.NPM_TOKEN is
# defined but GitHub Action don't allow it yet.
if: |
github.event_name == 'push' ||
github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
runs-on: ubuntu-latest
needs: test
outputs:
from_version: ${{ steps.step1.outputs.from_version }}
to_version: ${{ steps.step1.outputs.to_version }}
is_upgraded_version: ${{steps.step1.outputs.is_upgraded_version }}
is_upgraded_version: ${{ steps.step1.outputs.is_upgraded_version }}
is_release_beta: ${{steps.step1.outputs.is_release_beta }}
steps:
- uses: garronej/github_actions_toolkit@v2.2
- uses: garronej/ts-ci@v1.1.3
id: step1
with:
action_name: is_package_json_version_upgraded
branch: ${{ github.head_ref || github.ref }}

update_changelog:
runs-on: ubuntu-latest
needs: check_if_version_upgraded
if: needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true'
steps:
- uses: garronej/github_actions_toolkit@v2.4
- uses: garronej/ts-ci@v1.1.3
with:
action_name: update_changelog
branch: ${{ github.ref }}
branch: ${{ github.head_ref || github.ref }}

create_github_release:
runs-on: ubuntu-latest
needs:
- update_changelog
- check_if_version_upgraded
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
- name: Build GitHub release body
id: step1
run: |
Expand All @@ -98,10 +101,10 @@ jobs:
with:
name: Release v${{ needs.check_if_version_upgraded.outputs.to_version }}
tag_name: v${{ needs.check_if_version_upgraded.outputs.to_version }}
target_commitish: ${{ github.ref }}
target_commitish: ${{ github.head_ref || github.ref }}
body: ${{ steps.step1.outputs.body }}
draft: false
prerelease: false
prerelease: ${{ needs.check_if_version_upgraded.outputs.is_release_beta == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -138,7 +141,12 @@ jobs:
echo "Can't publish on NPM, You must first create a secret called NPM_TOKEN that contains your NPM auth token. https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets"
false
fi
npm publish
EXTRA_ARGS=""
if [ "$IS_BETA" = "true" ]; then
EXTRA_ARGS="--tag beta"
fi
npm publish $EXTRA_ARGS
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
VERSION: ${{ needs.check_if_version_upgraded.outputs.to_version }}
VERSION: ${{ needs.check_if_version_upgraded.outputs.to_version }}
IS_BETA: ${{ needs.check_if_version_upgraded.outputs.is_release_beta }}
82 changes: 82 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,85 @@
### **4.5.1** (2022-01-18)

- fix previous version

## **4.5.0** (2022-01-18)

- Read public/CNAME for domain name in --externel-assets mode

## **4.4.0** (2022-01-01)

- Merge pull request #73 from lazToum/main

(feature) added login-page-expired.ftl
- added login-page-expired.ftl
- Add update instruction for 4.3.0

## **4.3.0** (2021-12-27)

- Merge pull request #72 from praiz/main

feat(*): added login-update-password
- feat(*): added login-update-password

### **4.2.21** (2021-12-27)

- update dependencies

### **4.2.19** (2021-12-21)

- Merge pull request #70 from VBustamante/patch-1
- Added realm name field to KcContext mocks object
- Merge pull request #69 from VBustamante/patch-1

Adding name field to realm in KcContext type
- Adding name field to realm in KcContext type

### **4.2.18** (2021-12-17)

- Improve css url() import (fix CRA 5)

### **4.2.17** (2021-12-16)

- Fix path.join polyfill

### **4.2.16** (2021-12-16)



### **4.2.15** (2021-12-16)

- use custom polyfill for path.join (fix webpack 5 build)

### **4.2.14** (2021-12-12)

- Merge pull request #65 from InseeFrLab/doge_ftl_errors

Prevent ftl errors in Keycloak log
- Encourage users to report errors in logs
- Fix ftl error related to url.loginAction in saml-post-form.ftl
- Ftl prevent error with updateProfileCtx
- Ftl prevent error with auth.attemptedUsername
- Fix ftl error as comment formatting
- Merge remote-tracking branch 'origin/main' into doge_ftl_errors
- Update README, remove all instruction about errors in logs
- Avoid error in Keycloak logs, fix long template loading time
- Add missing collon in README sample code

Add miss ','

### **4.2.13** (2021-12-08)

- Fix broken link about how to import fonts #62
- Add a video to show how to test the theme in a local container

### **4.2.12** (2021-12-08)

- Update post build instructions

### **4.2.11** (2021-12-07)



### **4.2.10** (2021-11-12)

- Export an exaustive list of KcLanguageTag
Expand Down

0 comments on commit 2770102

Please sign in to comment.