Skip to content

Commit

Permalink
Merge pull request #439 from sanger/develop
Browse files Browse the repository at this point in the history
Develop into Master
  • Loading branch information
stevieing authored Jan 28, 2025
2 parents 8a744ed + 005358f commit 14aa7ef
Show file tree
Hide file tree
Showing 19 changed files with 240 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automated_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build_and_test_job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: nelonoel/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_release_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get specific changed files
id: changed-files-specific
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cups-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build_and_publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set release name
run: echo "RELEASE_VERSION=$(printf -- $(cat cups/.cups-release-version))" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build_and_publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build the Docker image
run: >-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
RAILS_ENV: test

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -33,7 +33,7 @@ jobs:
RAILS_ENV: test

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@
.byebug_history

/config/sprint/label_templates/*

# Ignore master key for decrypting credentials and more.
/config/credentials.yml.enc
/config/master.key
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.8.0
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.4
3.4.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3.4
FROM ruby:3.4.1
ENV BUNDLER_VERSION=2.2.6

RUN apt-get update -qq && apt-get install -y
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 7.1.3'
gem 'rails', '~> 7.2.1'

group :development, :test do
gem 'byebug'
Expand All @@ -18,6 +18,7 @@ group :development, :test do
gem 'ruby-prof'
gem 'spring'
gem 'sqlite3'
gem 'syslog' # no longer part of the standard library in ruby 3.4
end

gem 'active_model_serializers'
Expand Down
Loading

0 comments on commit 14aa7ef

Please sign in to comment.