Skip to content

Commit

Permalink
Merge pull request #355 from sanger/develop
Browse files Browse the repository at this point in the history
Develop -> Master
  • Loading branch information
BenTopping authored Jul 1, 2024
2 parents 7db4a1e + a845de1 commit 921f15e
Show file tree
Hide file tree
Showing 28 changed files with 728 additions and 1,352 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/add_prs_to_tech_debt_project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Calls a reusable workflow in the .github repo,
# which adds the PR that triggered this to the Technical Debt project board, if it is a depfu one.
# Passes the 'PSD-AddToProject' GitHub App key and App Id as secrets to the reusable workflow.

name: Add dependencies to technical debt project

on:
# Triggered on creation of pull requests with any label,
# or when a label is added to an existing pull request.
pull_request:
types:
- labeled

jobs:
call-workflow-add_to_technical_debt_project:
uses: sanger/.github/.github/workflows/add_to_tech_debt_project_reusable.yml@master
secrets:
app_id: ${{ secrets.ADD_TO_PROJECT_APP_ID_PSD }}
app_key: ${{ secrets.ADD_TO_PROJECT_APP_KEY_PSD }}

12 changes: 12 additions & 0 deletions .github/workflows/assign_issue_number.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Assign Issue Number

on:
issues:
types: [opened]

jobs:
call-add-to-project:
uses: sanger/.github/.github/workflows/generate_issue_number.yml@master
secrets:
app_id: ${{ secrets.ISSUE_GEN_APP_ID }}
app_key: ${{ secrets.ISSUE_GEN_APP_KEY }}
3 changes: 1 addition & 2 deletions .github/workflows/automated_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,5 @@ jobs:
account-type: org
org-name: sanger
keep-at-least: 5
skip-tags: latest
skip-tags: latest, *[!develop] # This will DELETE any images where the tag contains ANY characters in "develop"
token: ${{ secrets.REMOVE_OLD_IMAGES }}

2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2
2.7.0
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '~>6.1.0'
gem 'rails', '~> 7.1.3'

group :development, :test do
gem 'byebug'
Expand Down Expand Up @@ -33,7 +33,6 @@ gem 'sprint_client'

group :development do
gem 'listen', '~> 3.0'
gem 'raml_ruby', '~> 0.1.1'
end

group :deployment do
Expand Down
Loading

0 comments on commit 921f15e

Please sign in to comment.