Skip to content

Commit

Permalink
Merge branch 'develop' into sh51/combine-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenHulme committed Feb 14, 2024
2 parents 8e3dd88 + 82babf8 commit ffdb01b
Show file tree
Hide file tree
Showing 62 changed files with 2,123 additions and 772 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check_release_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@4
- uses: actions/checkout@v4

- name: Get specific changed files
id: changed-files-specific
uses: tj-actions/changed-files@v23
uses: tj-actions/changed-files@v41
with:
files: |
.release-version
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/compile_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Test compilation

on:
- push
- pull_request

env:
BUNDLE_WITHOUT: 'test lint'

jobs:
Build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: nelonoel/[email protected]

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

# Actually run our build
- name: Create Build
run: ./compile-build

# Create a release tag based on the branch name and .release-version file
- name: Set release tag
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
# On the develop branch this might create RELEASE_VERSION=2.4.6-987654321-develop
# On the master branch this would then only create RELEASE_VERSION=2.4.6
run: echo "RELEASE_VERSION=$(printf -- '%s%s\n' $(cat .release-version) $([ ${BRANCH_NAME} = "develop" ] && printf -- '-%s-develop' ${GITHUB_RUN_ID} || echo ""))" >> $GITHUB_ENV

# Do not actually save build or create release itself
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.42.0
3.45.0
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ group :test do
gem 'launchy' # Used by capybara for eg. save_and_open_screenshot
gem 'rails-controller-testing'
gem 'rspec-json_expectations'
gem 'rspec-rails', '6.1.0'
gem 'rspec-rails', '6.1.1'
gem 'selenium-webdriver', '~> 4.1', require: false
gem 'simplecov', require: false
gem 'simplecov-lcov', require: false
Expand Down
Loading

0 comments on commit ffdb01b

Please sign in to comment.