Skip to content

Commit 5217857

Browse files
authored
Merge pull request #42 from ProteGO-Safe/release/4.8.0
Release/4.8.0
2 parents 7e896d3 + e6647f6 commit 5217857

File tree

96 files changed

+5588
-3141
lines changed

Some content is hidden

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

96 files changed

+5588
-3141
lines changed

.github/workflows/nodejs.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ jobs:
3636
&& startsWith(github.ref, 'refs/heads/release/')
3737
&& github.event_name == 'push'
3838
run: |
39-
echo "::set-env name=ENVIRONMENT::DEV"
39+
echo "ENVIRONMENT=DEV" >> $GITHUB_ENV
4040
4141
- name: Set env to STAGE
4242
if: startsWith(github.ref, 'refs/tags/')
4343
&& github.repository_owner != 'ProteGO-Safe'
4444
&& ( github.event.release.target_commitish == 'master' || startsWith( github.event.release.target_commitish, 'release' ))
4545
&& github.event_name == 'release'
4646
run: |
47-
echo "::set-env name=ENVIRONMENT::STAGE"
47+
echo "ENVIRONMENT=STAGE" >> $GITHUB_ENV
4848
4949
- name: Set env to PROD
5050
if: startsWith(github.ref, 'refs/tags/')
5151
&& github.repository_owner == 'ProteGO-Safe'
5252
&& ( github.event.release.target_commitish == 'master' || startsWith( github.event.release.target_commitish, 'release/3' ))
5353
&& github.event_name == 'release'
5454
run: |
55-
echo "::set-env name=ENVIRONMENT::PROD"
55+
echo "ENVIRONMENT=PROD" >> $GITHUB_ENV
5656
5757
- name: Set Env's
58-
run: echo "::set-env name=PROJECT_ENVS::${{ secrets[env.EV] }}"
58+
run: echo "PROJECT_ENVS=${{ secrets[env.EV] }}" >> $GITHUB_ENV
5959
env:
6060
EV: "${{ env.ENVIRONMENT }}_ENV"
6161
if: env.ENVIRONMENT == 'STAGE' || env.ENVIRONMENT == 'PROD' || env.ENVIRONMENT == 'DEV'
@@ -69,7 +69,7 @@ jobs:
6969
POEDITOR_TOKEN: ${{ secrets.POEDITOR_TOKEN }}
7070

7171
- name: Setu Correct curl for static assets from cdn
72-
run: echo "::set-env name=CURL_COMMAND::${{ secrets[env.CURL] }}"
72+
run: echo "CURL_COMMAND=${{ secrets[env.CURL] }}" >> $GITHUB_ENV
7373
env:
7474
CURL: "${{ env.ENVIRONMENT }}_CURL"
7575
if: env.ENVIRONMENT == 'STAGE' || env.ENVIRONMENT == 'PROD' || env.ENVIRONMENT == 'DEV'
@@ -114,23 +114,23 @@ jobs:
114114
&& startsWith(github.ref, 'refs/heads/release/')
115115
&& github.event_name == 'push'
116116
run: |
117-
echo "::set-env name=ENVIRONMENT::DEV"
117+
echo "name=ENVIRONMENT=DEV" >> $GITHUB_ENV
118118
119119
- name: Set env to STAGE
120120
if: startsWith(github.ref, 'refs/tags/')
121121
&& github.repository_owner != 'ProteGO-Safe'
122122
&& startsWith( github.event.release.target_commitish, 'release' )
123123
&& github.event_name == 'release'
124124
run: |
125-
echo "::set-env name=ENVIRONMENT::STAGE"
125+
echo "ENVIRONMENT=STAGE" >> $GITHUB_ENV
126126
127127
- name: Set env to PROD
128128
if: startsWith(github.ref, 'refs/tags/')
129129
&& github.repository_owner == 'ProteGO-Safe'
130130
&& ( github.event.release.target_commitish == 'master' || startsWith( github.event.release.target_commitish, 'release/3' ))
131131
&& github.event_name == 'release'
132132
run: |
133-
echo "::set-env name=ENVIRONMENT::PROD"
133+
echo "ENVIRONMENT=PROD" >> $GITHUB_ENV
134134
135135
- name: Download Artifact
136136
uses: actions/download-artifact@master
@@ -140,12 +140,12 @@ jobs:
140140

141141
- name: Set Env's from Git refs.
142142
run: |
143-
echo "::set-env name=SOURCE_NAME::${GITHUB_REF#refs/*/}"
144-
echo "::set-env name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}"
145-
echo "::set-env name=SOURCE_TAG::${GITHUB_REF#refs/tags/}"
146-
echo "::set-env name=GCP_SA_KEY::${{ secrets[env.SECRET_ENV] }}"
147-
echo "::set-env name=SECRET_PROJECT::${{ secrets[env.PROJECT_ENV] }}"
148-
echo "::set-env name=SITE_PROJECT::${{ secrets[env.SITE_ENV] }}"
143+
echo "SOURCE_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
144+
echo "SOURCE_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
145+
echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
146+
echo "GCP_SA_KEY=${{ secrets[env.SECRET_ENV] }}" >> $GITHUB_ENV
147+
echo "SECRET_PROJECT=${{ secrets[env.PROJECT_ENV] }}" >> $GITHUB_ENV
148+
echo "SITE_PROJECT=${{ secrets[env.SITE_ENV] }}" >> $GITHUB_ENV
149149
env:
150150
SECRET_ENV: "${{ env.ENVIRONMENT }}_FIREBASE_HOSTING_SAFE"
151151
PROJECT_ENV: "${{ env.ENVIRONMENT }}_FIREBASE_PROJECT"
@@ -154,14 +154,14 @@ jobs:
154154

155155
- name: Set SITE_PROJECT for V4 PROD
156156
run: |
157-
echo "::set-env name=SITE_PROJECT::${{ secrets[env.SITE_ENV] }}-v4"
157+
echo "SITE_PROJECT=${{ secrets[env.SITE_ENV] }}-v4" >> $GITHUB_ENV
158158
env:
159159
SITE_ENV: "${{ env.ENVIRONMENT }}_FIREBASE_SITE"
160160
if: ( env.ENVIRONMENT == 'PROD' && github.event.release.target_commitish == 'master' )
161161

162162
- name: Set SITE_PROJECT for V3 in PROD
163163
run: |
164-
echo "::set-env name=SITE_PROJECT::${{ secrets[env.SITE_ENV] }}"
164+
echo "SITE_PROJECT=${{ secrets[env.SITE_ENV] }}" >> $GITHUB_ENV
165165
env:
166166
SITE_ENV: "${{ env.ENVIRONMENT }}_FIREBASE_SITE"
167167
if: ( env.ENVIRONMENT == 'PROD' && startsWith( github.event.release.target_commitish, 'release/3' ) )

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 4.8.0
8+
9+
### Added
10+
- Integration with EFGS
11+
712
## 4.7.1
813

914
### Added

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ yarn test a
2121
### Run application locally
2222
```shell script
2323
git update-index --skip-worktree src/locales/resources.j (once)
24-
yarn prepare-tranlations
24+
yarn prepare-translations
2525
yarn install
2626
yarn start
2727
```

0 commit comments

Comments
 (0)