Merge branch 'nodejs:main' into docs/improve-docs

.github/workflows/push.yml

@@ -2,15 +2,15 @@ name: Lint
 on: [push, pull_request]
 jobs:
   Python:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       max-parallel: 2
       matrix:
         python-version: [2.7, 3.7]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

ansible/group_vars/release.yml

@@ -1,6 +1,7 @@
 jenkins_url: "https://ci-release.nodejs.org"
 # intentionally fetching `slave.jar` from ci.nodejs.org to avoid auth problems
 jenkins_worker_jar: "https://ci.nodejs.org/jnlpJars/slave.jar"
+jenkins_icon: "https://ci.nodejs.org/favicon.ico"
 server_user: "iojs"
 home: "/home"
 git_reference_path: "{{ home }}/{{ server_user }}/.ccache/node.shared.reference"

ansible/group_vars/test.yml

@@ -1,5 +1,6 @@
 jenkins_url: "https://ci.nodejs.org"
 jenkins_worker_jar: "{{ jenkins_url }}/jnlpJars/slave.jar"
+jenkins_icon: "{{ jenkins_url }}/favicon.ico"
 server_user: iojs
 home: "/home"
 git_reference_path: "{{ home }}/{{ server_user }}/git/io.js.reference"

ansible/roles/baselayout-windows/tasks/main.yml

@@ -13,7 +13,18 @@
     install_args: 'ADD_CMAKE_TO_PATH=System'
 
 - name: install Python 3
-  win_chocolatey: name=python
+  win_chocolatey:
+    install_args: Include_launcher=1
+    name: python3
+    pinned: yes
+    version: "3.10.8"
+
+- name: install Python 3
+  win_chocolatey:
+    install_args: Include_launcher=1
+    name: python
+    pinned: yes
+    version: "3.10.8"
 
 - name: install Python 2
   win_chocolatey: name=python2

ansible/roles/java-base/tasks/main.yml

@@ -47,36 +47,17 @@
     - restart Jenkins
   package:
     name: "{{ java_package_name }}"
-    state: latest
+    state: "{{ 'present' if os|match_key(pm) == 'pkgin' else 'latest' }}"
     # Package manager mapping in ansible/roles/package-upgrade/vars/main.yml.
     use: "{{ os|match_key(pm)|default(omit) }}"
 
-- name: install java tap (macOS)
-  become_user: administrator
-  when: java.rc > 0 and os|startswith("macos") and arch == "x64"
-  homebrew_tap:
-        name: AdoptOpenJDK/openjdk
-        state: present
-
 - name: install java (macOS)
-  become_user: administrator
-  when: java.rc > 0 and os|startswith("macos") and arch == "x64"
+  become_user: "{{ ansible_user }}"
+  when: java.rc > 0 and os|startswith("macos")
   homebrew_cask:
         name: "{{ java_package_name }}"
         state: present
 
-- name: Fetch java (Apple Silicon)
-  when: java.rc > 0 and os|startswith("macos11") and arch == "arm64"
-  shell:
-    chdir: "/Users/{{ ansible_user }}"
-    cmd: "curl -L -o zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz https://cdn.azul.com/zulu/bin/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz"
-
-- name: Extract java (Apple Silicon)
-  when: java.rc > 0 and os|startswith("macos11") and arch == "arm64"
-  shell:
-    chdir: "/Users/{{ ansible_user }}"
-    cmd: "tar -xf zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz"
-
 - name: install webupd8 oracle java 8 extras
   when: java.rc > 0 and os == "ubuntu1404" and arch != "ppc64"
   package: name="{{item}}" state=present

ansible/roles/java-base/vars/main.yml

@@ -14,10 +14,10 @@ packages: {
   'fedora32': 'java-11-openjdk-headless',
   'freebsd': 'openjdk11-jre',
   'ibmi': 'openjdk-11-ea',
-  'macos': 'adoptopenjdk8',
+  'macos': 'temurin17',
   'rhel7': 'java-11-openjdk',
   'rhel8': 'java-17-openjdk',
-  'smartos': 'openjdk8',
+  'smartos': 'openjdk11',
   'ubuntu': 'openjdk-17-jre-headless',
   'ubuntu1604': 'openjdk-8-jre-headless',
   'ubuntu1404': 'oracle-java8-installer',

ansible/roles/jenkins-worker-windows/tasks/main.yml

@@ -4,12 +4,12 @@
 # Install the Jenkins worker
 #
 
-- name: install Java 8
-  win_chocolatey: name=jdk8
+- name: install Java 17
+  win_chocolatey: name=Temurin17
 
 - name: download Jenkins icon
   win_get_url:
-    url: 'http://mirrors.jenkins-ci.org/art/jenkins-logo/favicon.ico'
+    url: '{{ jenkins_icon }}'
     dest: 'C:\jenkins.ico'
     force: no
 

ansible/roles/jenkins-worker/vars/main.yml

@@ -86,13 +86,9 @@ java_path: {
   'macos10.14': 'java',
   'macos10.15': 'java',
   'macos11': 'java',
-  # Currently hardcoded untill adopt have their build available
-  'macos11.0': '/Users/{{ ansible_user }}/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java',
-  'smartos15': '/opt/local/java/openjdk8/bin/java',
-  'smartos16': '/opt/local/java/openjdk8/bin/java',
-  'smartos17': '/opt/local/java/openjdk8/bin/java',
-  'smartos18': '/opt/local/java/openjdk8/bin/java',
-  'smartos20': '/opt/local/java/openjdk8/bin/java',
+  'macos11.0': 'java',
+  'smartos18': '/opt/local/java/openjdk11/bin/java',
+  'smartos20': '/opt/local/java/openjdk11/bin/java',
   'zos24': '/usr/lpp/java/J8.0_64/bin/java'
   }
 

ansible/roles/package-upgrade/tasks/partials/brew.yml

@@ -8,12 +8,13 @@
     raw: xcode-select --print-path &> /dev/null
     register: xcode
     ignore_errors: yes
+    check_mode: no
 
   - name: Install xcode-tools
     script: files/install-xcode.sh
     when: xcode.rc > 1
 
-  - name: Check if Homebrew is already installed (Apple Sillicon)
+  - name: Check if Homebrew is already installed (Apple Silicon)
     stat:
       path: /opt/homebrew/bin/brew
     register: armbrew
@@ -45,10 +46,10 @@
     homebrew_tap:
       name: buo/cask-upgrade
 
-  - name: Add AdoptOpenJDK Java Repo
+  - name: Install brew cask-versions
     become_user: "{{ ansible_user }}"
     homebrew_tap:
-      name: AdoptOpenJDK/openjdk
+      name: homebrew/cask-versions
 
   - name: Update Casks
     become_user: "{{ ansible_user }}"

doc/ssh.md

@@ -21,9 +21,9 @@ for build working group members.
    comments:
 
     ```
-     # begin: node.js template
+    # begin: node.js template
 
-     # end: node.js template
+    # end: node.js template
     ```
 4. Follow the instructions in the [ansible guide](../ansible/README.md) to
    install ansible on your local machine.