From d54dc1096148b52b1d6a66e7724dd2628a14feb0 Mon Sep 17 00:00:00 2001 From: Katsuya HIDAKA Date: Fri, 30 Oct 2026 12:08:21 +0900 Subject: Update GitHub Actions workflows to Ubuntu 26.04 --- .github/actions/setup-redmine/action.yml | 9 --------- .github/workflows/linters.yml | 6 +++--- .github/workflows/tests.yml | 4 ++-- test/unit/repository_bazaar_test.rb | 18 +++++++++--------- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.github/actions/setup-redmine/action.yml b/.github/actions/setup-redmine/action.yml index 96809954d..691c11fac 100644 --- a/.github/actions/setup-redmine/action.yml +++ b/.github/actions/setup-redmine/action.yml @@ -19,15 +19,6 @@ runs: sudo apt-get install --yes --quiet ghostscript gsfonts locales subversion bzr cvs mercurial imagemagick pandoc sudo locale-gen en_US # for bazaar non ascii test - - name: Allow imagemagick to read PDF files - shell: bash - run: | - echo '' > policy.xml - echo '' >> policy.xml - echo '' >> policy.xml - sudo rm /etc/ImageMagick-6/policy.xml - sudo mv policy.xml /etc/ImageMagick-6/policy.xml - - if: ${{ inputs.db-type == 'sqlite3' }} name: Prepare test database for sqlite3 shell: bash diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 945cc42a4..e7b76b2b9 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -5,7 +5,7 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - name: Checkout code @@ -21,7 +21,7 @@ jobs: run: bundle exec rubocop --parallel stylelint: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - name: Checkout code @@ -39,7 +39,7 @@ jobs: run: npx stylelint "app/assets/stylesheets/**/*.css" bundle-audit: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - name: Checkout code diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ebd5b681..a1a1f2b38 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ on: jobs: tests: name: test ${{matrix.db}} ruby-${{ matrix.ruby }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 strategy: matrix: @@ -69,7 +69,7 @@ jobs: system-tests: name: system test - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - name: Checkout code diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb index 979af26f7..1c3bf208c 100644 --- a/test/unit/repository_bazaar_test.rb +++ b/test/unit/repository_bazaar_test.rb @@ -181,20 +181,20 @@ class RepositoryBazaarTest < ActiveSupport::TestCase if File.directory?(REPOSITORY_PATH_NON_ASCII) && RUN_LATIN1_OUTPUT_TEST # https://www.redmine.org/issues/42024 - def skip_bzr_failure_on_ubuntu24 + def skip_bzr_failure_on_ubuntu return unless File.exist?('/etc/os-release') os_release = File.read('/etc/os-release') name = os_release[/^NAME="(.+?)"$/, 1] version = os_release[/^VERSION_ID="(.+?)"$/, 1] - if name == 'Ubuntu' && version == '24.04' - skip 'bzr command fails on Ubuntu 24.04, causing this test to fail' + if name == 'Ubuntu' && %w(24.04 26.04).include?(version) + skip "bzr command fails on Ubuntu #{version}, causing this test to fail" end end def test_cat_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo buf = @@ -216,7 +216,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase end def test_annotate_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo ann1 = @@ -238,7 +238,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase end def test_diff_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo diff1 = @@ -251,7 +251,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase end def test_entries_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo entries = latin1_repo.entries("test-#{CHAR_1_UTF8_HEX}-dir", 2) @@ -263,7 +263,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase end def test_entry_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo ["test-#{CHAR_1_UTF8_HEX}-dir", @@ -283,7 +283,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase end def test_changeset_latin1_path - skip_bzr_failure_on_ubuntu24 + skip_bzr_failure_on_ubuntu latin1_repo = create_latin1_repo assert_equal 0, latin1_repo.changesets.count -- 2.51.0