Updating ruby version to 3.3 (#7606)

* Updating ruby version to 3.3 Then adding gems csv and faraday-retry to Gemfile to avoid warnings and b/c that gems are not in the standard lib anymore * remove dockerfile and update gemfile lock * Update CONTRIBUTING.md Co-authored-by: Heath Stewart <heaths@microsoft.com> * update lock --------- Co-authored-by: Heath Stewart <heaths@microsoft.com>
2024-05-30 10:59:30 -07:00 · 2024-05-30 10:59:30 -07:00 · 9769151ea8
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -1,49 +0,0 @@
-# Use Ruby 2.7 version from approved Microsoft Container Registry.
-# This image already contains the vscode:vscode user:group and sudoers support.
-FROM mcr.microsoft.com/devcontainers/ruby:2.7-buster
-ARG USERNAME=vscode
-
-# The port on which Jekyll will serve the site
-ARG PORT=4000
-EXPOSE ${PORT}
-
-# ENV Variables required by Jekyll
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8 \
-    TZ=America/Chicago
-
-# Install packages as root
-USER root
-
-# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
-RUN apt-get update \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && LANG=C LC_ALL=C apt-get -y install --no-install-recommends \
-        apt-utils \
-        dialog \
-        sudo \
-        #
-        # Install vim, git, process tools, lsb-release
-        git \
-        openssh-client \
-        less \
-        locales \
-    #
-    # Add en_US.UTF-8 locale
-    && echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
-    #
-    # Generate locale files
-    && locale-gen \
-    #
-    # Clean up
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# Switch back to the non-root user
-USER ${USERNAME}
-SHELL ["/bin/bash", "-c"]
-
-# Speed up subsequent `bundle install`
-RUN echo 'gem: --no-ri --no-rdoc' > /home/${USERNAME}/.gemrc
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,7 +1,6 @@
 {
    "name": "Jekyll",
-    "dockerFile": "Dockerfile",
-
+    "image": "mcr.microsoft.com/devcontainers/ruby:3.3-bullseye",
    "customizations": {
        "vscode": {
            // Set *default* container specific settings.json values on container create.
@ -21,6 +20,14 @@
            ]
        }
    },
+    
+    // ENV Variables required by Jekyll
+    "containerEnv": {
+        "LANG":"en_US.UTF-8",
+        "LANGUAGE":"en_US:en",
+        "LC_ALL":"en_US.UTF-8",
+        "TZ":"America/Chicago"
+    },

    "features": {
        // Use the GitHub CLI to easily push and create PRs from terminal.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -32,7 +32,9 @@ Codespaces is new technology that allows you to use a container as your developm
    bundle exec jekyll serve
    ```

-### VS Code Codespaces
+> When you click the link in Codespaces for the running server, like `http://127.0.0.1:4000/azure-sdk/`, you will be redirected to the Codespaces url, which will not contain the URL path at the end `azure-sdk/` and will display a `Not Found` error. To fix it, add the `azure-sdk/` path at the end.
+
+### VS Code Devcontainer

 1. Install the [VS Code Remote Extension Pack](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack)
 1. When you open the Azure SDK repo in VS Code, it will prompt you to open the project in the Devcontainer. If it does not prompt you, press `F1`, and select `Dev Containers: Open Folder in Container...`/
@ -55,7 +57,7 @@ GitHub instructions can be found at <https://docs.github.com/en/pages/setting-up

 Here's how to setup the site locally:

-1. [Install Ruby 2.7](https://rubyinstaller.org/downloads/).
+1. [Install Ruby 3.3](https://rubyinstaller.org/downloads/).

    You can find complete installation instructions here: <https://jekyllrb.com/docs/installation>.

--- a/2
+++ b/2
@ -6,6 +6,8 @@ gem "github-pages", ">= 231", group: [:jekyll_plugins]
 # Force certain dependencies that may be upgraded to an unsupported version for Ruby 2.7 otherwise.
 gem "nokogiri", "~> 1.16.5"
 gem "webrick", "~> 1.8"
+gem 'csv', '~> 3.3'
+gem 'faraday-retry', '~> 2.2', '>= 2.2.1'

 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.3)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@ -14,16 +14,17 @@ GEM
    addressable (2.8.6)
      public_suffix (>= 2.0.2, < 6.0)
    base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
    colorator (1.1.0)
    commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.1)
    connection_pool (2.4.1)
-    dnsruby (1.72.0)
+    csv (3.3.0)
+    dnsruby (1.72.1)
      simpleidn (~> 0.2.1)
    drb (2.2.1)
    em-websocket (0.5.3)
@ -33,11 +34,12 @@ GEM
      ffi (>= 1.15.0)
    eventmachine (1.2.7)
    execjs (2.9.1)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
    ffi (1.16.3)
    forwardable-extended (2.6.0)
    gemoji (4.1.0)
@ -96,7 +98,7 @@ GEM
      activesupport (>= 2)
      nokogiri (>= 1.4)
    http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
    jekyll (3.9.5)
      addressable (~> 2.4)
@ -215,15 +217,25 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    mini_portile2 (2.8.6)
    minima (2.5.1)
      jekyll (>= 3.5, < 5.0)
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
-    minitest (5.22.3)
+    minitest (5.23.1)
    mutex_m (0.2.0)
-    nokogiri (1.16.5)
-      mini_portile2 (~> 2.8.2)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.5-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-linux)
      racc (~> 1.4)
    octokit (4.25.1)
      faraday (>= 1, < 3)
@ -231,14 +243,13 @@ GEM
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
    public_suffix (5.0.5)
-    racc (1.7.3)
+    racc (1.8.0)
    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
      ffi (~> 1.0)
    rexml (3.2.8)
      strscan (>= 3.0.9)
    rouge (3.30.0)
-    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    safe_yaml (1.0.5)
    sass (3.7.4)
@ -249,8 +260,7 @@ GEM
    sawyer (0.9.2)
      addressable (>= 2.3.5)
      faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    simpleidn (0.2.3)
    strscan (3.1.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
@ -258,20 +268,25 @@ GEM
      ethon (>= 0.9.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
    unicode-display_width (1.8.0)
+    uri (0.13.0)
    webrick (1.8.1)

 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux

 DEPENDENCIES
+  csv (~> 3.3)
+  faraday-retry (~> 2.2, >= 2.2.1)
  github-pages (>= 231)
  nokogiri (~> 1.16.5)
  tzinfo-data
  webrick (~> 1.8)

 BUNDLED WITH
-   2.1.4
+   2.5.9