Merge branch 'master' into feature/compliance-scale

feature/compliance-scale
Cedric 2022-06-20 10:09:11 +00:00 committed by GitHub
commit 81d5276604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 149 additions and 63 deletions

87
.github/workflows/releases.yml vendored Normal file
View File

@ -0,0 +1,87 @@
name: MonarcAppFO releases
on:
push:
branches: [ 'master' ]
tags: [ 'v*.*', 'v*.*.*', 'v*.*.*-*' ]
pull_request:
branches: [ 'master' ]
jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [ "16.x" ]
php-version: [ "7.4" ]
steps:
- uses: actions/checkout@v2
- name: install deps
run: sudo apt-get update && sudo apt install -y gettext
# PHP
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2.3
extensions: bcmath
- name: Validate composer.json and composer.lock
run: composer validate
- name: Install PHP dependencies
run: composer install --prefer-dist --no-progress --no-suggest --no-dev
- name: Symlink Monarc modules
run: |
mkdir -p module/Monarc
ln -s ../../vendor/monarc/core module/Monarc/Core
ln -s ../../vendor/monarc/frontoffice module/Monarc/FrontOffice
# javascript
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: |
npm install
head node_modules/ng_client/src/ClientApp.js
- name: Install ng-anr dependencies
run: |
npm install
working-directory: node_modules/ng_anr/
- name: Install ng-client dependencies
run: |
npm install
working-directory: node_modules/ng_client/
# final "cleanup"
- name: post job
run: |
bash -ex ./scripts/link_modules_resources.sh
bash -ex ./scripts/compile_translations.sh
# prepare release
- name: Get repository name
id: repository
run: echo "::set-output name=pathref::$(echo '${{ github.repository }}' | cut -d'/' -f2)-$(echo '${{ github.ref_name }}' | sed 's/[^[:alnum:]\.-]/_/g')"
- name: create artifact archive
run: |
tar --exclude .git --exclude .github -zcf '../${{ steps.repository.outputs.pathref }}.tar.gz' .
- name: release
uses: softprops/action-gh-release@v1
with:
files: |
../${{ steps.repository.outputs.pathref }}.tar.gz
fail_on_unmatched_files: true
if: startsWith(github.ref, 'refs/tags/')

View File

@ -106,18 +106,17 @@ cd ../..
./scripts/compile_translations.sh ./scripts/compile_translations.sh
if [[ $forceClearCache -eq 1 ]]; then if [[ $forceClearCache -eq 1 ]]; then
# Clear doctrine cache # Clear Laminas cache
# Move to Monarc/Core Module.php
php ./public/index.php orm:clear-cache:metadata php ./public/index.php orm:clear-cache:metadata
php ./public/index.php orm:clear-cache:query php ./public/index.php orm:clear-cache:query
php ./public/index.php orm:clear-cache:result php ./public/index.php orm:clear-cache:result
# Clear ZF2 cache # Clear Laminas cache
touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade
fi fi
if [[ $forceClearCache -eq 0 && $bypass -eq 0 ]]; then if [[ $forceClearCache -eq 0 && $bypass -eq 0 ]]; then
# Clear ZF2 cache # Clear Laminas cache
touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade
fi fi