Merge branch 'main' into Gao-Jun/main

Author: keelerm84

.github/actions/ci/action.yml

@@ -1,8 +1,11 @@
 name: CI Workflow
-description: 'Shared CI workflow.'
+description: "Shared CI workflow."
 inputs:
   ruby-version:
-    description: 'The version of ruby to setup and run'
+    description: "The version of ruby to setup and run"
+    required: true
+  token:
+    description: "GH token used to fetch the SDK test harness"
     required: true
 
 runs:
@@ -11,11 +14,10 @@ runs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ inputs.ruby-version }}
-        bundler: 2.2.10
 
     - name: Install dependencies
       shell: bash
-      run: bundle _2.2.10_ install
+      run: bundle install
 
     - name: Skip end to end tests for jruby
       if: ${{ startsWith(inputs.ruby-version, 'jruby') }}
@@ -24,9 +26,28 @@ runs:
 
     - name: Run tests
       shell: bash
-      run: bundle _2.2.10_ exec rspec spec
+      run: bundle exec rspec spec
+
+    - name: Run RuboCop
+      if: ${{ !startsWith(inputs.ruby-version, 'jruby') }}
+      shell: bash
+      run: bundle exec rubocop --parallel
+
+    - name: Build contract tests
+      if: ${{ !startsWith(inputs.ruby-version, 'jruby') }}
+      shell: bash
+      run: make build-contract-tests
 
-    - name: Run contract tests
+    - name: Start contract test service
       if: ${{ !startsWith(inputs.ruby-version, 'jruby') }}
       shell: bash
-      run: make contract-tests
+      run: make start-contract-test-service-bg
+
+    - uses: launchdarkly/gh-actions/actions/[email protected]
+      if: ${{ !startsWith(inputs.ruby-version, 'jruby') }}
+      with:
+        test_service_port: 8000
+        token: ${{ inputs.token }}
+        repo: sse-contract-tests
+        branch: main
+        version: v1

.github/workflows/ci.yml

@@ -1,13 +1,13 @@
 name: Run CI
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths-ignore:
-      - '**.md' # Do not need to run CI for markdown changes.
+      - "**.md" # Do not need to run CI for markdown changes.
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths-ignore:
-      - '**.md'
+      - "**.md"
 
 jobs:
   build:
@@ -17,14 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
-          - jruby-9.3
+          - "3.2"
+          - "3.3"
+          - "3.4"
           - jruby-9.4
+          - jruby-10.0
 
     steps:
       - uses: actions/checkout@v4
@@ -34,3 +31,4 @@ jobs:
       - uses: ./.github/actions/ci
         with:
           ruby-version: ${{ matrix.ruby-version }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manual-publish.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       dry_run:
-        description: 'Is this a dry run. If so no package will be published.'
+        description: "Is this a dry run. If so no package will be published."
         type: boolean
         required: true
 
@@ -18,16 +18,17 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: launchdarkly/gh-actions/actions/[email protected]
-        name: 'Get rubygems API key'
+        name: "Get rubygems API key"
         with:
           aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
-          ssm_parameter_pairs: '/production/common/releasing/rubygems/api_key = GEM_HOST_API_KEY'
+          ssm_parameter_pairs: "/production/common/releasing/rubygems/api_key = GEM_HOST_API_KEY"
 
       - id: build-and-test
         name: Build and Test
         uses: ./.github/actions/ci
         with:
-          ruby-version: '3.0'
+          ruby-version: "3.2"
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - id: publish
         name: Publish Package

.github/workflows/release-please.yml

@@ -23,15 +23,16 @@ jobs:
 
       - uses: launchdarkly/gh-actions/actions/[email protected]
         if: ${{ steps.release.outputs.releases_created == 'true' }}
-        name: 'Get rubygems API key'
+        name: "Get rubygems API key"
         with:
           aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
-          ssm_parameter_pairs: '/production/common/releasing/rubygems/api_key = GEM_HOST_API_KEY'
+          ssm_parameter_pairs: "/production/common/releasing/rubygems/api_key = GEM_HOST_API_KEY"
 
       - uses: ./.github/actions/ci
         if: ${{ steps.release.outputs.releases_created == 'true' }}
         with:
-          ruby-version: '3.0'
+          ruby-version: "3.2"
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: ./.github/actions/publish
         if: ${{ steps.release.outputs.releases_created == 'true' }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.2.3"
+  ".": "2.2.6"
 }