From d226072f347d918c2d93868b1d9f834e4e6e3953 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Wed, 24 Mar 2021 16:27:54 +0100 Subject: [PATCH] Add ruby 2.7 to github actions test --- .../{tests_with_mysql.yml => tests.yml} | 22 ++++- .github/workflows/tests_with_postgres.yml | 99 ------------------- README.md | 2 +- 3 files changed, 21 insertions(+), 102 deletions(-) rename .github/workflows/{tests_with_mysql.yml => tests.yml} (86%) delete mode 100644 .github/workflows/tests_with_postgres.yml diff --git a/.github/workflows/tests_with_mysql.yml b/.github/workflows/tests.yml similarity index 86% rename from .github/workflows/tests_with_mysql.yml rename to .github/workflows/tests.yml index 3b07cf6..827b5e7 100644 --- a/.github/workflows/tests_with_mysql.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: Tests with MySQL +name: Tests on: push: pull_request: @@ -12,11 +12,28 @@ jobs: strategy: matrix: - ruby: ['2.6', '2.4'] + ruby: ['2.7', '2.6', '2.4'] redmine: ['4.0-stable', '4.1-stable', 'master'] + exclude: + - ruby: '2.7' + redmine: ['4.0-stable', '4.1-stable'] fail-fast: false services: + postgres: + image: postgres:13 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + ports: + - 5432:5432 + + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + mysql: image: mysql:8.0 env: @@ -34,6 +51,7 @@ jobs: - name: Verify MySQL connection from host run: | mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -pBestPasswordEver -e "SHOW DATABASES" + if: matrix.db == 'mysql' - name: Checkout Redmine uses: actions/checkout@v2 diff --git a/.github/workflows/tests_with_postgres.yml b/.github/workflows/tests_with_postgres.yml deleted file mode 100644 index 3910c09..0000000 --- a/.github/workflows/tests_with_postgres.yml +++ /dev/null @@ -1,99 +0,0 @@ -name: Tests with PostgreSQL -on: - push: - pull_request: - schedule: - - cron: '0 5 * * *' - -jobs: - test: - name: ${{ matrix.redmine }} ruby-${{ matrix.ruby }} - runs-on: ubuntu-latest - - strategy: - matrix: - ruby: ['2.6', '2.4'] - redmine: ['4.0-stable', '4.1-stable', 'master'] - fail-fast: false - - services: - postgres: - image: postgres:13 - env: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - ports: - - 5432:5432 - - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - - steps: - - name: Checkout Redmine - uses: actions/checkout@v2 - with: - repository: redmine/redmine - ref: ${{ matrix.redmine }} - path: redmine - - - name: Checkout redmine_messenger - uses: actions/checkout@v2 - with: - repository: AlphaNodes/redmine_messenger - path: redmine/plugins/redmine_messenger - - - name: Update package archives - run: sudo apt-get update --yes --quiet - - - name: Install package dependencies - run: > - sudo apt-get install --yes --quiet - build-essential - cmake - libicu-dev - libpq-dev - - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - - name: Prepare Redmine source - working-directory: redmine - run: | - sed -i '/rubocop/d' Gemfile - rm -f .rubocop* - cp plugins/redmine_messenger/test/support/database-postgres.yml config/database.yml - cp plugins/redmine_messenger/test/support/configuration.yml config/configuration.yml - - - name: Install Ruby dependencies - working-directory: redmine - run: | - bundle install --jobs=4 --retry=3 --without development - - - name: Run Redmine rake tasks - env: - RAILS_ENV: test - working-directory: redmine - run: | - bundle exec rake generate_secret_token - bundle exec rake db:create db:migrate redmine:plugins:migrate - bundle exec rake db:test:prepare - - - name: Run tests - env: - RAILS_ENV: test - REDMINE_VERSION: ${{ matrix.redmine }} - working-directory: redmine - run: bundle exec rake redmine:plugins:test NAME=redmine_messenger RUBYOPT="-W0" - - - name: Run uninstall test - env: - RAILS_ENV: test - REDMINE_VERSION: ${{ matrix.redmine }} - working-directory: redmine - run: bundle exec rake redmine:plugins:migrate NAME=redmine_messenger VERSION=0 diff --git a/README.md b/README.md index fab2e4e..d179b77 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Messenger plugin for Redmine This plugin posts updates to issues in your Redmine installation to [Slack](https://slack.com/), [Rocket.Chat](https://rocket.chat/), [Discord](https://discordapp.com/) or [Mattermost](https://about.mattermost.com/) channel. -[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=fla)](https://www.redmine.org/plugins/redmine_messenger) [![Run Linters](https://github.com/AlphaNodes/redmine_messenger/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/redmine_messenger/actions?query=workflow%3A%22Run+Linters%22) [![Tests with MySQL](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests_with_mysql.yml/badge.svg)](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests_with_mysql.yml) [![Tests with PostgreSQL](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests_with_postgres.yml/badge.svg)](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests_with_postgres.yml) +[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=fla)](https://www.redmine.org/plugins/redmine_messenger) [![Run Linters](https://github.com/AlphaNodes/redmine_messenger/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/redmine_messenger/actions?query=workflow%3A%22Run+Linters%22) [![Tests](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests.yml/badge.svg)](https://github.com/AlphaNodes/redmine_messenger/actions/workflows/tests.yml) Features --------