Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing ci #81

Merged
merged 4 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 53 additions & 16 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
working-directory: ./rust

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -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 }}

Expand All @@ -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
Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down
8 changes: 6 additions & 2 deletions nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rust/src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
Loading