From 427d61edc774be43c9c98c5f84954da855e43d50 Mon Sep 17 00:00:00 2001 From: discoursebot Date: Tue, 27 Apr 2021 06:13:19 -0400 Subject: [PATCH] DEV: Update CI workflows (#118) Co-authored-by: CvX --- .github/workflows/plugin-linting.yml | 19 ++++--- .github/workflows/plugin-tests.yml | 82 ++++++++-------------------- 2 files changed, 33 insertions(+), 68 deletions(-) diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml index 7534015..f43eae8 100644 --- a/.github/workflows/plugin-linting.yml +++ b/.github/workflows/plugin-linting.yml @@ -20,21 +20,16 @@ jobs: node-version: 12 - name: Set up ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 - - - name: Setup bundler - run: gem install bundler -v 2.1.4 --no-doc - - - name: Setup gems - run: bundle install --jobs 4 + bundler-cache: true - name: Yarn install - run: yarn install --dev + run: yarn install - name: ESLint - run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern assets/javascripts + run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,assets}/javascripts - name: Prettier run: | @@ -42,6 +37,12 @@ jobs: if [ -d "assets" ]; then \ yarn prettier --list-different "assets/**/*.{scss,js,es6}" ; \ fi + if [ -d "test" ]; then \ + yarn prettier --list-different "test/**/*.{js,es6}" ; \ + fi + + - name: Ember template lint + run: yarn ember-template-lint assets/javascripts - name: Rubocop run: bundle exec rubocop . diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml index 80a05e9..cf0a527 100644 --- a/.github/workflows/plugin-tests.yml +++ b/.github/workflows/plugin-tests.yml @@ -9,17 +9,16 @@ on: jobs: build: - name: "${{ matrix.target }}-${{ matrix.build_types }}" - runs-on: ${{ matrix.os }} + name: ${{ matrix.build_type }} + runs-on: ubuntu-latest + container: discourse/discourse_test:release timeout-minutes: 60 env: DISCOURSE_HOSTNAME: www.example.com RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072 - BUILD_TYPE: ${{ matrix.build_types }} - TARGET: ${{ matrix.target }} RAILS_ENV: test - PGHOST: localhost + PGHOST: postgres PGUSER: discourse PGPASSWORD: discourse @@ -27,10 +26,8 @@ jobs: fail-fast: false matrix: - build_types: ["BACKEND", "FRONTEND"] - target: ["PLUGINS"] - os: [ubuntu-latest] - ruby: ["2.6"] + build_type: ["backend", "frontend"] + ruby: ["2.7"] postgres: ["12"] redis: ["4.x"] @@ -50,13 +47,13 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 with: repository: discourse/discourse fetch-depth: 1 - name: Install plugin - uses: actions/checkout@master + uses: actions/checkout@v2 with: path: plugins/${{ github.event.repository.name }} fetch-depth: 1 @@ -78,46 +75,30 @@ jobs: git config --global user.email "ci@ci.invalid" git config --global user.name "Discourse CI" - - name: Setup packages - run: | - sudo apt-get update - sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead - wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh - - - name: Update imagemagick - if: env.BUILD_TYPE == 'BACKEND' - run: | - wget https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-imagemagick - chmod +x install-imagemagick - sudo ./install-imagemagick - - name: Setup redis uses: shogo82148/actions-setup-redis@v1 with: redis-version: ${{ matrix.redis }} - - name: Setup ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - - name: Setup bundler - run: | - gem install bundler -v 2.1.4 --no-doc - bundle config deployment 'true' - bundle config without 'development' - - name: Bundler cache uses: actions/cache@v2 - id: bundler-cache with: path: vendor/bundle - key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} + key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('**/Gemfile.lock') }} restore-keys: | - ${{ runner.os }}-gem- + ${{ runner.os }}-${{ matrix.ruby }}-gem- - name: Setup gems - run: bundle install --jobs 4 + run: | + bundle config --local path vendor/bundle + bundle config --local deployment true + bundle config --local without development + bundle install --jobs 4 + bundle clean + + - name: Lint English locale + if: matrix.build_type == 'backend' + run: bundle exec ruby script/i18n_lint.rb "plugins/${{ github.event.repository.name }}/locales/{client,server}.en.yml" - name: Get yarn cache directory id: yarn-cache-dir @@ -133,35 +114,18 @@ jobs: ${{ runner.os }}-${{ matrix.os }}-yarn- - name: Yarn install - run: yarn install --dev + run: yarn install - name: Migrate database run: | bin/rake db:create bin/rake db:migrate - - name: Create parallel databases - if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE' - run: | - bin/rake parallel:create - bin/rake parallel:migrate - - - name: Core RSpec - if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE' - run: | - bin/turbo_rspec - bin/rake plugin:spec - - name: Plugin RSpec - if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'PLUGINS' && steps.check_spec.outputs.files_exists == 'true' + if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true' run: bin/rake plugin:spec[${{ github.event.repository.name }}] - - name: Core QUnit - if: env.BUILD_TYPE == 'FRONTEND' && env.TARGET == 'CORE' - run: bundle exec rake qunit:test['1200000'] - timeout-minutes: 30 - - name: Plugin QUnit - if: env.BUILD_TYPE == 'FRONTEND' && env.TARGET == 'PLUGINS' && steps.check_qunit.outputs.files_exists == 'true' + if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true' run: bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000'] timeout-minutes: 30