Preserving history from main while resetting HEAD

.github/workflows/format-code.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.2.6'
+        ruby-version: '3.2.2'
 
     - name: Format code
       env:

.ruby-version

@@ -1 +1 @@
-3.2.6
+3.2.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.6-alpine3.19
+FROM ruby:3.2.2-alpine3.16
 
 ARG UID=1001
 ARG GROUP=app
@@ -23,7 +23,6 @@ ARG BUILD_DEV
 
 # required for certain linting tools that read files, such as erb-lint
 ENV LANG='C.UTF-8' \
-  LC_ALL='C.UTF-8' \
   RACK_ENV=${RACK_ENV} \
   DB_HOST=${DB_HOST} \
   DB_USER=${DB_USER} \
@@ -36,7 +35,7 @@ ENV LANG='C.UTF-8' \
   CLOUDWATCH_LINK=${CLOUDWATCH_LINK}
 
 RUN apk add --no-cache --virtual .build-deps build-base && \
-  apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius 
+  apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius
 
 RUN if [ "${BUILD_DEV}" = "true" ] ; then \
     apk add --no-cache alpine-sdk ruby-dev; \

Gemfile.lock

@@ -440,7 +440,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.2.6p234
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.19
+   2.3.3

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       context: .
       args:
         UID: "${UID}"
-        BUNDLE_INSTALL_FLAGS: "${BUNDLE_INSTALL_FLAGS:- --jobs 5 --retry 5}"
+        BUNDLE_INSTALL_FLAGS: "${BUNDLE_INSTALL_FLAGS:- --jobs 20 --retry 5 --full-index}"
     user: "${UID}:${UID}"
     command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
     volumes:

spec/use_cases/read_certificate_metadata_spec.rb

@@ -33,28 +33,22 @@
       expected_serial = "261449075976929706890225671845538541127278523818"
       expect(serial).to eq expected_serial
     end
+
     it "extracts the extensions of the certificate" do
       extensions = use_case.call[:extensions]
       expected_extensions = <<~EXTENSIONS
         subjectKeyIdentifier:
         \t46:53:FE:BC:50:C0:5D:02:B5:24:1B:BA:B3:B8:E2:89:87:85:40:08
 
         authorityKeyIdentifier:
-        \t46:53:FE:BC:50:C0:5D:02:B5:24:1B:BA:B3:B8:E2:89:87:85:40:08
+        \tkeyid:46:53:FE:BC:50:C0:5D:02:B5:24:1B:BA:B3:B8:E2:89:87:85:40:08
 
 
         basicConstraints: critical
         \tCA:TRUE
       EXTENSIONS
 
-      puts "Actual extensions (raw): #{extensions.inspect}"
-      puts "Expected extensions (raw): #{expected_extensions.strip.inspect}"
-
-      normalize = ->(str) { str.gsub(/\n+/, "\n").strip }
-      actual_extensions = normalize.call(extensions.force_encoding("UTF-8"))
-      expected_extensions = normalize.call(expected_extensions.force_encoding("UTF-8"))
-
-      expect(actual_extensions).to eq expected_extensions
+      expect(extensions).to eq expected_extensions.strip
     end
   end