Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
version: 2.1

# ENV VARS required
# AZURE_SP - service principal given the Contributor role on the Azure Container Registry
# AZURE_SP_PASSWORD - service principal password
# AZURE_SP_TENANT - tenant of servie principal
# AZURE_SUBSCRIPTION - name of Azure subscription with the container registry
# AZURE_ACR_REGISTRY - name of Azure Container Registry

orbs:
azure-cli: circleci/azure-cli@1.2.0

aliases:
- defaults: &defaults
docker:
- image: cimg/node:22.17
- image: cimg/ruby:3.1.7-node
working_directory: ~/code
- &restore-repo-cache
key: socket-goodcity-repo-{{ .Environment.CIRCLE_SHA1 }}
Expand Down Expand Up @@ -55,8 +48,6 @@ jobs:

deployment:
<<: *defaults
docker:
- image: cimg/ruby:2.7.8-node
steps:
- restore_cache: *restore-repo-cache
- restore_cache: *restore-yarn-cache
Expand All @@ -65,16 +56,6 @@ jobs:
- run: |
([ "$CIRCLE_BRANCH" == "live" ] && bundle exec cap production deploy) || ([ "$CIRCLE_BRANCH" == "master" ] && bundle exec cap staging deploy)

build-and-deploy-docker-image:
executor: azure-cli/default
working_directory: ~/code
steps:
- restore_cache: *restore-repo-cache
- azure-cli/install
- azure-cli/login-with-service-principal
- run: az account set --subscription $AZURE_SUBSCRIPTION
- run: az acr build --registry $AZURE_ACR_REGISTRY --image socketio:$CIRCLE_BRANCH .

workflows:
build-and-deploy:
jobs:
Expand All @@ -88,9 +69,3 @@ workflows:
filters:
branches:
only: /^(master|live)$/
# - build-and-deploy-docker-image:
# requires:
# - checkout_code
# filters:
# branches:
# only: /^(master|live)$/
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.7.3
ruby-3.1.7

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Ruby 3.1.x is now EOL — consider targeting a supported branch.

Ruby 3.1.7 is the final release of the Ruby 3.1 series; no further updates, including security fixes, will be provided for the 3.1 branch. While upgrading from 2.7.3 is an improvement, landing on an already-EOL version means any future CVE will go unpatched. Consider bumping directly to Ruby 3.2 or 3.3, both of which still receive security updates.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In @.ruby-version at line 1, Replace the EOL ruby-3.1.7 in .ruby-version with a
supported branch (e.g., ruby-3.3 or ruby-3.2 using the latest patch) and ensure
consistency across the repo by updating any other ruby-version declarations
(Gemfile's ruby directive, CI matrix entries, Dockerfiles, or .tool-versions if
present). After changing .ruby-version, run bundle install / bundle lock,
rebuild any Ruby-based containers, and run the test suite to catch compatibility
issues; if tests fail, adjust gem versions or code for the chosen Ruby minor
release.

2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GEM
capistrano-nvm (0.0.7)
capistrano (~> 3.1)
concurrent-ruby (1.3.6)
ed25519 (1.3.0)
ed25519 (1.4.0)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
logger (1.7.0)
Expand Down
2 changes: 0 additions & 2 deletions config/deploy/preview.rb

This file was deleted.