diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcaec28dd..55d7a2560 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,13 +7,13 @@ jobs: name: Rubocop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Ruby uses: ruby/setup-ruby@v1 with: ruby-version: 3.4.1 - name: Cache gems - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} @@ -31,13 +31,13 @@ jobs: name: Erblint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Ruby uses: ruby/setup-ruby@v1 with: ruby-version: 3.4.1 - name: Cache gems - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} @@ -55,7 +55,7 @@ jobs: name: ESLint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Node.js uses: actions/setup-node@v1 with: @@ -63,7 +63,7 @@ jobs: - name: Cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v1 + - uses: actions/cache@v4 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -96,7 +96,7 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Ruby uses: ruby/setup-ruby@v1 with: @@ -110,12 +110,12 @@ jobs: with: chrome-version: 125 - name: Cache node_modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} - name: Cache gems - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 22dc0ad94..3250e4753 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -25,22 +25,22 @@ jobs: tags: | type=semver,pattern={{version}} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Create .version file run: echo ${{ github.ref_name }} > .version - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/Gemfile.lock b/Gemfile.lock index 7f37cb0c7..da75225a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -223,9 +223,12 @@ GEM concurrent-ruby (~> 1.1) webrick (~> 1.7) websocket-driver (~> 0.7) - ffi (1.17.0) - ffi (1.17.0-aarch64-linux-gnu) - ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.1) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) geom2d (0.4.1) globalid (1.2.1) activesupport (>= 6.1) @@ -334,12 +337,18 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.17.2) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.17.2-aarch64-linux) + nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.17.2-x86_64-linux) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) racc (~> 1.4) oj (3.16.8) bigdecimal (>= 3.0) @@ -520,10 +529,13 @@ GEM simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) smart_properties (1.17.0) - sqlite3 (2.4.1) + sqlite3 (2.5.0) mini_portile2 (~> 2.8.0) - sqlite3 (2.4.1-aarch64-linux-gnu) - sqlite3 (2.4.1-x86_64-linux-gnu) + sqlite3 (2.5.0-aarch64-linux-gnu) + sqlite3 (2.5.0-aarch64-linux-musl) + sqlite3 (2.5.0-arm64-darwin) + sqlite3 (2.5.0-x86_64-linux-gnu) + sqlite3 (2.5.0-x86_64-linux-musl) stringio (3.1.2) strip_attributes (1.14.1) activemodel (>= 3.0, < 9.0) @@ -569,8 +581,11 @@ GEM PLATFORMS aarch64-linux + aarch64-linux-musl + arm64-darwin ruby x86_64-linux + x86_64-linux-musl DEPENDENCIES annotate diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue index 62181fc5a..f30b2dd34 100644 --- a/app/javascript/submission_form/area.vue +++ b/app/javascript/submission_form/area.vue @@ -191,10 +191,16 @@ class="whitespace-pre-wrap text-gray-400" :class="{ 'w-full': field.preferences?.align }" >{{ field.name }} - + {{ modelValue.join(', ') }} - + {{ formattedDate }}