diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d8e954fdc..478d410c1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,12 +52,12 @@ jobs: submodules: recursive - name: Build site and check links run: make build BUILD_CONFIGS=_config.yml,_config_stage.yml -# - name: Install Node for Firebase install -# uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 -# with: -# node-version: ${{ env.NODE_VERSION }} -# - name: Install Firebase CLI -# run: npm install -g firebase-tools@12.9.1 +# - name: Install Node for Firebase install +# uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 +# with: +# node-version: ${{ env.NODE_VERSION }} +# - name: Install Firebase CLI +# run: npm install -g firebase-tools@13.0.2 - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: stable @@ -77,18 +77,18 @@ jobs: submodules: recursive - name: Build site and check links run: make build -# - name: Install Node for Firebase install -# uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 -# with: -# node-version: ${{ env.NODE_VERSION }} -# - name: Install Firebase CLI -# run: npm install -g firebase-tools@12.9.1 -# - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d -# with: -# sdk: stable -# - run: tool/check-links.sh -# - name: Deploy to Firebase hosting -# run: make deploy # TODO(drewroengoogle) Run deploy on Cloud Build. +# - name: Install Node for Firebase install +# uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 +# with: +# node-version: ${{ env.NODE_VERSION }} +# - name: Install Firebase CLI +# run: npm install -g firebase-tools@13.0.2 +# - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d +# with: +# sdk: stable +# - run: tool/check-links.sh +# - name: Deploy to Firebase hosting +# run: make deploy # TODO(drewroengoogle) Run deploy on Cloud Build. - name: Deploy CN run: make deploy env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5675628ab0..f4c5878aa6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ but two of the primary repos are the [Flutter SDK](https://github.com/flutter/flutter), and this repo, the [Flutter website](https://github.com/flutter/website). To contribute a fix to a repo, submit a [pull request -(PR)](https://services.github.com/on-demand/github-cli/open-pull-request-github). +(PR)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). For information on contributing code or API docs to the Flutter SDK, see [Contributing to diff --git a/Dockerfile b/Dockerfile index 6eb8f114cd..bcc1347858 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.2-slim-bookworm@sha256:02a091c83d1aa1070c0f6fefcbd2aff58ddd3430e2d5661c6ef2142b1383349b AS base +FROM ruby:3.3-slim-bookworm@sha256:763422273a15e307b044fcb3ad6b1ef6c290d2043ac73596842aba5659dc7318 as base SHELL ["/usr/bin/bash", "-c"] @@ -85,6 +85,7 @@ FROM node AS dev #RUN bundle config mirror.https://rubygems.org https://mirrors.tuna.tsinghua.edu.cn/rubygems ENV JEKYLL_ENV=development +ENV RUBY_YJIT_ENABLE=1 RUN gem install bundler COPY Gemfile Gemfile.lock ./ RUN bundle config set force_ruby_platform true @@ -116,6 +117,7 @@ RUN tool/move_docs.sh; tool/translator/build.sh FROM node AS build ENV JEKYLL_ENV=production +ENV RUBY_YJIT_ENABLE=1 RUN gem install bundler COPY Gemfile Gemfile.lock ./ RUN bundle config set force_ruby_platform true diff --git a/Gemfile b/Gemfile index 58d1c2d79f..1e3180951a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'jekyll', '4.3.2' +gem 'jekyll', '4.3.3' gem 'jekyll-sass-converter', '~> 3.0.0' gem 'webrick' diff --git a/Gemfile.lock b/Gemfile.lock index 9755142d54..69cb8be8f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,10 +11,10 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) colorator (1.1.0) concurrent-ruby (1.2.2) connection_pool (2.4.1) @@ -28,11 +28,11 @@ GEM forwardable-extended (~> 2.5) ffi (1.16.3) forwardable-extended (2.6.0) - google-protobuf (3.25.0) + google-protobuf (3.25.1) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -72,12 +72,12 @@ GEM mini_portile2 (2.8.5) minitest (5.20.0) mutex_m (0.2.0) - nokogiri (1.15.4) + nokogiri (1.15.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.3) + public_suffix (5.0.4) racc (1.7.3) rake (13.1.0) rb-fsevent (0.11.2) @@ -102,7 +102,7 @@ PLATFORMS DEPENDENCIES activesupport (~> 7.1.2) - jekyll (= 4.3.2) + jekyll (= 4.3.3) jekyll-include-cache (~> 0.2.1) jekyll-sass-converter (~> 3.0.0) jekyll-toc (~> 0.18.0) @@ -110,4 +110,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.4.21 + 2.5.3 diff --git a/_config.yml b/_config.yml index c3f2ce3ec4..a3335f7635 100644 --- a/_config.yml +++ b/_config.yml @@ -56,6 +56,44 @@ flutterfire: https://firebase.flutter.dev dartpadx-dart: https://dartpad.cn/experimental/embed-new-dart.html ## Adding the exp version for dart here. youtube-site: https://youtube.com +## Software minimum versions + +appmin: + github_win: 2.4 + github_mac: 2.4 + vscode: 1.75 + android_studio: '2022.3 (Giraffe) or later' + intellij_idea: '2022.3 or later' + android_sdk: 19 + powershell: 5.0 +devmin: + windows: '64-bit version of Microsoft Windows 10' + macos: '10.14 (Mojave)' + linux: + debian: 10 + ubuntu: '18.04 LTS' +targetmin: + windows: 'Microsoft Windows 7' + macos: '10.13 (Ventura)' + linux: + debian: 9 + ubuntu: '18.04 LTS' + ios: 11 + android: 'Android API level 19' + +## Software current versions + +appnow: + flutter: '3.13.4' + github_win: 2.4 + vscode: '1.81.1' + android_studio: '2022.3 (Giraffe) or later' + android_sdk: '33.0.0' + intellij: '2023.1' + powershell: 5.0 + xcode: '15' + ios: '17' + cocoapods: '1.12' ########### Jekyll ########### @@ -182,6 +220,9 @@ alert: version-note: >-