diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38278132b9..ed4d4888e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ on: - cron: '0 3 * * MON' jobs: - prepare: + build: runs-on: ubuntu-latest steps: - name: Checkout @@ -59,27 +59,6 @@ jobs: git config user.email release@firefly-iii.org git config advice.addIgnoredFile false git config push.autoSetupRemote true - - name: Install dependencies - run: | - rm -rf vendor composer.lock - composer update --no-dev --no-scripts --no-plugins -q - validate: - needs: - - prepare - runs-on: ubuntu-latest - steps: - - name: Run PHP Coding Standards Fixer - run: | - .ci/phpcs.sh || true - - name: Code cleanup - id: code-cleanup - uses: JC5/firefly-iii-dev@main - with: - action: 'ff3:code' - output: '' - env: - FIREFLY_III_ROOT: /github/workspace - GH_TOKEN: '' - name: Lint PHP run: | php_lint_file() @@ -95,18 +74,13 @@ jobs: export -f php_lint_file - find . -path ./vendor -prune -o -name '*.php' | parallel -j 8 php_lint_file {} + find . -path ./vendor -prune -o -name '*.php' | parallel -j 4 php_lint_file {} if [ "$?" -ne 0 ] then exit 1 fi - translate: - needs: - - prepare - runs-on: ubuntu-latest - steps: - - name: Download translations + - name: Crowdin action uses: crowdin/github-action@v2 with: upload_sources: true @@ -117,41 +91,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }} CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }} - - name: Generate JSON v1 - id: json-v1 - uses: JC5/firefly-iii-dev@main - with: - action: 'ff3:json-translations v1' - output: '' - env: - FIREFLY_III_ROOT: /github/workspace - GH_TOKEN: '' - - name: Generate JSON v2 - id: json-v2 - uses: JC5/firefly-iii-dev@main - with: - action: 'ff3:json-translations v2' - output: '' - env: - FIREFLY_III_ROOT: /github/workspace - GH_TOKEN: '' - generate-js: - needs: - - prepare - - translate - runs-on: ubuntu-latest - steps: - - name: Build JS - run: | - npm install - npm run prod --workspace=v1 - npm run build --workspace=v2 - npm update - cleanup-meta: - needs: - - prepare - runs-on: ubuntu-latest - steps: - name: Cleanup changelog id: cleanup-changelog uses: JC5/firefly-iii-dev@main @@ -180,10 +119,48 @@ jobs: FIREFLY_III_ROOT: /github/workspace GH_TOKEN: "" FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} + - name: Generate JSON v1 + id: json-v1 + uses: JC5/firefly-iii-dev@main + with: + action: 'ff3:json-translations v1' + output: '' + env: + FIREFLY_III_ROOT: /github/workspace + GH_TOKEN: '' + - name: Generate JSON v2 + id: json-v2 + uses: JC5/firefly-iii-dev@main + with: + action: 'ff3:json-translations v2' + output: '' + env: + FIREFLY_III_ROOT: /github/workspace + GH_TOKEN: '' + - name: Code cleanup + id: code-cleanup + uses: JC5/firefly-iii-dev@main + with: + action: 'ff3:code' + output: '' + env: + FIREFLY_III_ROOT: /github/workspace + GH_TOKEN: '' + - name: Build JS + run: | + npm install + npm run prod --workspace=v1 + npm run build --workspace=v2 + npm update + - name: Run CI + run: | + rm -rf vendor composer.lock + composer update --no-dev --no-scripts --no-plugins -q + sudo chown -R runner:docker resources/lang + .ci/phpcs.sh || true - name: Calculate variables run: | - ls - pwd + # set some variables releaseName=$version originalName=$version @@ -245,15 +222,6 @@ jobs: echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV" env: version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} - build: - needs: - - prepare - - validate - - translate - - generate-js - - cleanup-meta - runs-on: ubuntu-latest - steps: - name: Commit all changes run: | # add all content, except output.txt (this contains the changelog and/or the download instructions)