diff --git a/.github/workflows/pro-integration-tests.yml b/.github/workflows/pro-integration-tests.yml index 8a11cd5d23..6e7aa03072 100644 --- a/.github/workflows/pro-integration-tests.yml +++ b/.github/workflows/pro-integration-tests.yml @@ -37,7 +37,7 @@ jobs: if: github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_pro_tests == 'true' runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: @@ -127,7 +127,7 @@ jobs: if: github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_pro_tests == 'true' runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: @@ -307,7 +307,7 @@ jobs: if: github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_pro_tests == 'true' runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} # Redis service container services: redis: diff --git a/.github/workflows/pro-lint.yml b/.github/workflows/pro-lint.yml index c25ab7af84..3702567993 100644 --- a/.github/workflows/pro-lint.yml +++ b/.github/workflows/pro-lint.yml @@ -36,7 +36,7 @@ jobs: if: github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_pro_lint == 'true' runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/pro-package-tests.yml b/.github/workflows/pro-package-tests.yml index 61579c1e2f..5e1c0a8124 100644 --- a/.github/workflows/pro-package-tests.yml +++ b/.github/workflows/pro-package-tests.yml @@ -37,7 +37,7 @@ jobs: if: github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_pro_tests == 'true' runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: @@ -138,7 +138,7 @@ jobs: --health-timeout 5s --health-retries 5 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: @@ -211,7 +211,7 @@ jobs: ruby-version: ['3.3.7'] runs-on: ubuntu-22.04 env: - REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }} + REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }} steps: - uses: actions/checkout@v4 with: diff --git a/react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb b/react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb index 2853d001b5..9d7a3e2206 100644 --- a/react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb +++ b/react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb @@ -17,13 +17,13 @@ module LicensePublicKey # This should be implemented after publishing the API endpoint on the ShakaCode website. KEY = OpenSSL::PKey::RSA.new(<<~PEM.strip.strip_heredoc) -----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlJFK3aWuycVp9X05qhGo -FLztH8yjpuAKUoC4DKHX0fYjNIzwG3xwhLWKKDCmnNfuzW5R09/albl59/ZCHFyS -I7H7Aita1l9rnHCHEyyyJUs/E7zMG27lsECkNoCJr5cD/qtabY45uggFJrl3YRgy -ieonNQvxLtvPuatAPd6jfs/PlHOYA3z+t0C5uDW5YlXJkLKzKKiikvxsyOnk94Uq -J7FWzSdlvY08aLkERZDlGuWcjvQexVz7NCAMR050aEgobwxg2AuaCWDd8cDH6Asq -mhGxQr7ulvrXfDMI6dBqa3ihfjgk+dpA8ilfUsCFc8ovbIA0oE8BTIxogyYr2KaH -vQIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcS/fpHz5CbnTQxb4Zot +khjzXu7xNS+Y9VKfapMaHOMzNoCMfy1++hxHJatRedr+YQfZRCjfiN168Cpe+dhe +yfNtOoLU9/+/5jTsxH+WQJWNRswyKms5HNajlIMN1GEYdZmZbvOPaZvh6ENsT+EV +HnhjJtsHl7qltBoL0ul7rONxaNHCzJcKk4lf3B2/1j1wpA91MKz4bbQVh4/6Th0E +/39f0PWvvBXzQS+yt1qaa1DIX5YL6Aug5uEpb1+6QWcN3hCzqSPBv1HahrG50rsD +gf8KORV3X2N9t6j6iqPmRqfRcTBKtmPhM9bORtKiSwBK8LsIUzp2/UUmkdHnkyzu +NQIDAQAB -----END PUBLIC KEY----- PEM end diff --git a/react_on_rails_pro/packages/node-renderer/src/shared/licensePublicKey.ts b/react_on_rails_pro/packages/node-renderer/src/shared/licensePublicKey.ts index 88c898a601..bca624a330 100644 --- a/react_on_rails_pro/packages/node-renderer/src/shared/licensePublicKey.ts +++ b/react_on_rails_pro/packages/node-renderer/src/shared/licensePublicKey.ts @@ -9,11 +9,11 @@ // This task fetches the latest key from the API endpoint: // http://shakacode.com/api/public-key export const PUBLIC_KEY = `-----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlJFK3aWuycVp9X05qhGo -FLztH8yjpuAKUoC4DKHX0fYjNIzwG3xwhLWKKDCmnNfuzW5R09/albl59/ZCHFyS -I7H7Aita1l9rnHCHEyyyJUs/E7zMG27lsECkNoCJr5cD/qtabY45uggFJrl3YRgy -ieonNQvxLtvPuatAPd6jfs/PlHOYA3z+t0C5uDW5YlXJkLKzKKiikvxsyOnk94Uq -J7FWzSdlvY08aLkERZDlGuWcjvQexVz7NCAMR050aEgobwxg2AuaCWDd8cDH6Asq -mhGxQr7ulvrXfDMI6dBqa3ihfjgk+dpA8ilfUsCFc8ovbIA0oE8BTIxogyYr2KaH -vQIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcS/fpHz5CbnTQxb4Zot +khjzXu7xNS+Y9VKfapMaHOMzNoCMfy1++hxHJatRedr+YQfZRCjfiN168Cpe+dhe +yfNtOoLU9/+/5jTsxH+WQJWNRswyKms5HNajlIMN1GEYdZmZbvOPaZvh6ENsT+EV +HnhjJtsHl7qltBoL0ul7rONxaNHCzJcKk4lf3B2/1j1wpA91MKz4bbQVh4/6Th0E +/39f0PWvvBXzQS+yt1qaa1DIX5YL6Aug5uEpb1+6QWcN3hCzqSPBv1HahrG50rsD +gf8KORV3X2N9t6j6iqPmRqfRcTBKtmPhM9bORtKiSwBK8LsIUzp2/UUmkdHnkyzu +NQIDAQAB -----END PUBLIC KEY-----`; diff --git a/react_on_rails_pro/spec/dummy/Gemfile.lock b/react_on_rails_pro/spec/dummy/Gemfile.lock index bbd82b79bd..7c61ec1d02 100644 --- a/react_on_rails_pro/spec/dummy/Gemfile.lock +++ b/react_on_rails_pro/spec/dummy/Gemfile.lock @@ -253,7 +253,7 @@ GEM racc (~> 1.4) nokogiri (1.18.8-x86_64-linux-musl) racc (~> 1.4) - package_json (0.1.0) + package_json (0.2.0) parallel (1.25.1) parser (3.3.3.0) ast (~> 2.4.1) @@ -402,9 +402,9 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.0.0) + semantic_range (3.1.0) sexp_processor (4.17.1) - shakapacker (8.0.0) + shakapacker (9.3.0) activesupport (>= 5.2) package_json rack-proxy (>= 0.6.1) @@ -536,7 +536,7 @@ DEPENDENCIES sass-rails scss_lint selenium-webdriver (= 4.9.0) - shakapacker (= 8.0.0) + shakapacker (= 9.3.0) spring spring-watcher-listen sprockets