Skip to content

Commit

Permalink
Merge pull request #19723 from kategengler/kg-workflow-cleanup
Browse files Browse the repository at this point in the history 
Upgrade to actions/setup-node@v2 and use the included caching
  • Loading branch information
@kategengler
kategengler committed Aug 23, 2021
2 parents 4f40312 + 4b51390 commit 2935309
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 70 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/alpha-releases.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -35,14 +32,11 @@ jobs:
needs: [test]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
registry-url: 'https://registry.npmjs.org'
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: setup git
Expand Down
84 changes: 24 additions & 60 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: linting
Expand All @@ -40,13 +37,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -70,13 +64,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -99,13 +90,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -122,13 +110,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -146,13 +131,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- uses: actions/download-artifact@v1
Expand All @@ -170,13 +152,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand All @@ -194,13 +173,10 @@ jobs:
needs: [lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- uses: actions/download-artifact@v1
Expand All @@ -216,13 +192,10 @@ jobs:
needs: [basic-test, lint]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- uses: actions/download-artifact@v1
Expand All @@ -239,14 +212,11 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v')
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
registry-url: 'https://registry.npmjs.org'
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build for publish
Expand All @@ -264,13 +234,10 @@ jobs:
if: github.event_name == 'push' && contains(github.ref, 'cron') != true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build for publish
Expand All @@ -290,13 +257,10 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-modules-${{ hashFiles('**/yarn.lock') }}
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build for publish
Expand Down

0 comments on commit 2935309

Please sign in to comment.