Merge pull request #81 from dominikwilkowski/ci

fixing ci
dominikwilkowski · Jun 13, 2024 · e433942 · e433942
2 parents 1a807b0 + f8c064d
commit e433942
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 19 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -28,7 +28,7 @@ jobs:
         working-directory: ./rust
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -81,14 +81,14 @@ jobs:
         working-directory: ./rust
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
@@ -114,23 +114,60 @@ jobs:
   test-nodejs:
     strategy:
       matrix:
-        node: [ 12, 14, 16, 18 ]
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macOS-latest
-    runs-on: ${{ matrix.os }}
+        os-node:
+          - os: ubuntu-latest
+            node: 12
+          - os: ubuntu-latest
+            node: 14
+          - os: ubuntu-latest
+            node: 16
+          - os: ubuntu-latest
+            node: 18
+          - os: ubuntu-latest
+            node: 20
+          - os: ubuntu-latest
+            node: 22
+
+          # - os: macOS-latest
+          #   node: 12
+          # Not available for ARM
+          # - os: macOS-latest
+          #   node: 14
+          # Not available for ARM
+          - os: macOS-latest
+            node: 16
+          - os: macOS-latest
+            node: 18
+          - os: macOS-latest
+            node: 20
+          - os: macOS-latest
+            node: 22
+
+          - os: windows-latest
+            node: 12
+          - os: windows-latest
+            node: 14
+          - os: windows-latest
+            node: 16
+          - os: windows-latest
+            node: 18
+          - os: windows-latest
+            node: 20
+          - os: windows-latest
+            node: 22
+
+    runs-on: ${{ matrix.os-node.os }}
     defaults:
       run:
         working-directory: ./nodejs
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node }}
+          node-version: ${{ matrix.os-node.node }}
 
       - name: Get yarn cache
         id: yarn-cache
@@ -182,10 +219,10 @@ jobs:
         working-directory: ./nodejs
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
@@ -239,14 +276,14 @@ jobs:
         working-directory: ./rust
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 

diff --git a/nodejs/README.md b/nodejs/README.md
@@ -92,14 +92,18 @@ This package is tested on the below platform and node combinations as part of ou
 | Linux    | v14  |
 | Linux    | v16  |
 | Linux    | v18  |
-| MacOS    | v12  |
-| MacOS    | v14  |
+| Linux    | v20  |
+| Linux    | v22  |
 | MacOS    | v16  |
 | MacOS    | v18  |
+| MacOS    | v20  |
+| MacOS    | v22  |
 | Windows  | v12  |
 | Windows  | v14  |
 | Windows  | v16  |
 | Windows  | v18  |
+| Windows  | v20  |
+| Windows  | v22  |
 
 ### Unit tests
 

diff --git a/rust/src/render.rs b/rust/src/render.rs
@@ -116,7 +116,7 @@ pub fn render(options: Options) -> RenderedString {
 
 	options.text.chars().for_each(|og_letter| {
 		d(&format!("render() \u{2022} loop og_letter:{:?}", og_letter), 1, Dt::Log, &options, &mut std::io::stdout());
-		// we insert the pipe here so that out match will find it. it's not defined in our font files because it's just a new-line
+		// we insert the pipe here so that our match will find it. it's not defined in our font files because it's just a new-line
 		font.chars.insert(String::from("|"), vec![String::from("|")]);
 		match font.chars.get(&og_letter.to_string().to_uppercase()) {
 			None => {