Skip to content

Commit

Permalink
Merge pull request #1222 from bryceosterhaus/windowsTests
Browse files Browse the repository at this point in the history 
chore: fix github ci
  • Loading branch information
@bryceosterhaus
bryceosterhaus authored Jun 7, 2024
2 parents 6a629f0 + d370d20 commit ceeedfc
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 52 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/amd-loader.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-amd-loader
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/format.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/guidelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/js-themes-toolkit-v8-x.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [10.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-js-themes-toolkit-v8
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/js-themes-toolkit-v9-x.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [10.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-js-themes-toolkit-v9
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/js-toolkit-v2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-js-toolkit
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lockfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-portal-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: echo "${{ steps.fetch-latest.outputs.LATEST_RELEASE }}" > portal-release.txt

- name: Cache Latest Portal Release Version
uses: actions/cache@v2
uses: actions/cache@v4
id: cache-version
with:
path: ./portal-release.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/prettier-plugin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-prettier-plugin
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/projects.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

env:
CI: true
yarn-cache-name: yarn-cache-22
yarn-cache-name: yarn-cache-25
yarn-cache-path: .yarn

jobs:
Expand All @@ -34,13 +34,13 @@ jobs:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -53,16 +53,16 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-v2-${{ hashFiles('**/yarn.lock') }}-
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/senna.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
node-version: [10.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -49,13 +49,13 @@ jobs:
node-version: [10.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use or update Yarn cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.yarn-cache-path }}
key: ${{ runner.os }}-${{ env.yarn-cache-name }}-${{ hashFiles('**/yarn.lock') }}-senna
Expand Down
2 changes: 1 addition & 1 deletion projects/js-toolkit/scripts/build.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const spawn = require('./util/spawn');

function compile(dir) {
try {
spawn('npx', ['tsc'], {cwd: dir});
spawn('yarn', ['tsc'], {cwd: dir});
}
catch (error) {
throw new Error(
Expand Down

0 comments on commit ceeedfc

Please sign in to comment.