diff --git a/.github/workflows/index.wac.ts b/.github/workflows/index.wac.ts index 66b191d..8aa4e3e 100644 --- a/.github/workflows/index.wac.ts +++ b/.github/workflows/index.wac.ts @@ -1,4 +1,4 @@ -import { createWorkflow, NormalJob } from "../../src"; +import { createWorkflow, NormalJob } from "../../src/index.js"; const defaultEnv = { NODE_OPTIONS: "--max_old_space_size=4096" @@ -9,9 +9,9 @@ const checkoutInstallBuildTest: NormalJob["steps"] = [ uses: "actions/setup-node@v2", with: { "node-version": 14 } }, - { uses: "actions/checkout@v2" }, + { uses: "actions/checkout@v4" }, { - uses: "actions/cache@v2", + uses: "actions/cache@v4", with: { path: ".yarn/cache", key: "yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}" @@ -24,7 +24,11 @@ const checkoutInstallBuildTest: NormalJob["steps"] = [ export const push = createWorkflow({ name: "Push to main branch", - on: "push", + on: { + push: { + branches: ["main"] + } + }, env: defaultEnv, jobs: { buildTestRelease: { @@ -48,7 +52,7 @@ export const push = createWorkflow({ }); export const pullRequests = createWorkflow({ - name: "Push to main branch", + name: "Pull requests", on: "pull_request", env: defaultEnv, jobs: { diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml index 83d0ea2..e876839 100644 --- a/.github/workflows/pullRequests.yml +++ b/.github/workflows/pullRequests.yml @@ -2,7 +2,7 @@ # DO NOT MODIFY IT BY HAND. Instead, modify the source *.wac.ts file(s) # and run "github-actions-wac build" (or "ghawac build") to regenerate this file. # For more information, run "github-actions-wac --help". -name: Push to main branch +name: Pull requests 'on': pull_request env: NODE_OPTIONS: '--max_old_space_size=4096' @@ -14,8 +14,8 @@ jobs: - uses: actions/setup-node@v2 with: node-version: 14 - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: .yarn/cache key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 579b892..31a3e96 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,7 +3,10 @@ # and run "github-actions-wac build" (or "ghawac build") to regenerate this file. # For more information, run "github-actions-wac --help". name: Push to main branch -'on': push +'on': + push: + branches: + - main env: NODE_OPTIONS: '--max_old_space_size=4096' jobs: @@ -14,8 +17,8 @@ jobs: - uses: actions/setup-node@v2 with: node-version: 14 - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: .yarn/cache key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5966957..8261306 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,19 +4,29 @@