Skip to content

Commit

Permalink
Merge branch 'main' into bug/21361-negative-time-shown-incorrectly
Browse files Browse the repository at this point in the history
  • Loading branch information
schmijos authored Feb 8, 2024
2 parents 9f603e1 + 2128b60 commit a2ab12f
Show file tree
Hide file tree
Showing 9 changed files with 809 additions and 3,492 deletions.
58 changes: 30 additions & 28 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,56 @@ name: validation
on: push

jobs:
test_ruby:
lint-and-test:
runs-on: ubuntu-latest
steps:
- name: Checkout Redmine
uses: actions/checkout@v4
with:
repository: redmine/redmine
path: redmine
ref: 5.1-stable

- name: Checkout Tracky
uses: actions/checkout@v4
with:
repository: renuo/redmine_tracky
path: redmine/plugins/redmine_tracky
path: plugins/redmine_tracky

- name: Install Ruby
- name: Cache gems
uses: actions/cache@v3
with:
path: vendor/bundle
key: gems-${{ hashFiles('Gemfile', 'plugins/redmine_tracky/PluginGemfile.lock') }}

- name: Cache Node modules
uses: actions/cache@v3
with:
path: plugins/redmine_tracky/assets.src/node_modules
key: npm-${{ hashFiles('plugins/redmine_tracky/assets.src/package-lock.json') }}

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1.2'

- name: Start MySQL and update gems
run: gem update --system && sudo service mysql start
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: latest

- name: Start MySQL
run: sudo service mysql start

- name: Setup Tracky
run: cd redmine/plugins/redmine_tracky && ./bin/setup
working-directory: plugins/redmine_tracky
run: bin/setup
env:
GITHUB_ACTIONS: true

- name: Lint
run: cd redmine/plugins/redmine_tracky && rake lint_ruby
- name: Run linters
working-directory: plugins/redmine_tracky
run: rake lint

- name: Run tests
run: cd redmine && rake test TEST=plugins/redmine_tracky

check_javascript:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install node
uses: actions/setup-node@v4
with:
node-version: latest

- name: Install node modules
working-directory: ./assets.src
run: npm install

- name: Lint
run: rake lint_javascript
working-directory: plugins/redmine_tracky
run: rake test
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.2
20.11.0
4 changes: 0 additions & 4 deletions assets.src/.mocharc.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions assets.src/.yarnrc.yml

This file was deleted.

Loading

0 comments on commit a2ab12f

Please # to comment.