From ca630ef2b3676f682dda315c70fe0749c4537e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Wed, 9 Aug 2023 18:37:25 +0200 Subject: [PATCH 1/4] Add ruby 3.2 to test suite (#1755) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index add44345f25..2bc0c3c0896 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - ruby-version: [2.6, 2.7, '3.0', 3.1] + ruby-version: [2.6, 2.7, '3.0', 3.1, 3.2] steps: - uses: actions/checkout@v2 From cbdc43c25d77dd78e86d35eef81db97769fb8568 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 6 Feb 2024 23:25:39 -0500 Subject: [PATCH 2/4] Remove updating gem from CI (#1787) --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bc0c3c0896..ce6d975ffd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,6 @@ jobs: gems-${{ runner.os }}-${{ matrix.ruby-version }}- gems-${{ runner.os }}- - # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache - # can remove once ruby 2.3 is no longer supported - - run: gem update --system - - run: bundle config set deployment 'true' - name: bundle install run: | From 50239a76357ef4fb91e14f7a5a45dee501caf7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Wed, 7 Feb 2024 05:26:02 +0100 Subject: [PATCH 3/4] Handle incorrectly set language parameter (#1756) Co-authored-by: Matthew Peveler --- source/javascripts/app/_lang.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index cc5ac8b6bd8..c1bd6b2a9b0 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -143,7 +143,7 @@ under the License. languages = l; var presetLanguage = getLanguageFromQueryString(); - if (presetLanguage) { + if (presetLanguage && languages.includes(presetLanguage)) { // the language is in the URL, so use that language! activateLanguage(presetLanguage); From 97c8dd4cc9c75bf04e67a21d683d139a58326db2 Mon Sep 17 00:00:00 2001 From: Jared Moody Date: Tue, 6 Feb 2024 20:29:39 -0800 Subject: [PATCH 4/4] Update github actions/checkout and actions/cache to v3 (#1727) --- .github/workflows/build.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- .github/workflows/dev_deploy.yml | 6 +++--- .github/workflows/publish.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce6d975ffd1..34e1b77de6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,13 +15,13 @@ jobs: ruby-version: [2.6, 2.7, '3.0', 3.1, 3.2] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3eefbecc6c6..6a032b44969 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,13 +14,13 @@ jobs: ruby-version: 2.6 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 85c7f8b8471..d9edd290178 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -56,13 +56,13 @@ jobs: ruby-version: 2.6 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6c511807b22..149e72011c1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1