Skip to content

Commit

Permalink
CI fix - last working version 馃檹
Browse files Browse the repository at this point in the history
  • Loading branch information
benwinding committed Aug 16, 2023
1 parent 69e145c commit 12319e1
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions .github/workflows/push_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@v3
- uses: actions/setup-node@v1
with:
node-version: 16.14.2
- name: Cache node_modules
id: cache-modules
uses: actions/cache@v3
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('package.json') }}
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Check tests pass
run: yarn test
- name: Upload lib build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v2
with:
name: build-lib
path: dist
Expand All @@ -38,24 +38,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@v3
- uses: actions/setup-node@v1
with:
node-version: 16.14.2
- uses: actions/cache@v3
- uses: actions/cache@v1
id: cache-modules
with:
path: node_modules
key: ${{ runner.OS }}-deploy-${{ hashFiles('package.json') }}
- name: Download build-lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v2
with:
name: build-lib
path: dist
- name: Fix git error
run: git config --global --add safe.directory "/github/workspace"
- name: Deploy to npm! 馃殌 (if master branch)
if: github.ref == 'refs/heads/master'
uses: benwinding/merge-release@v2
uses: benwinding/merge-release@a2f36ebdb96a8735d288520e0852cb9edeb82227
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
Expand All @@ -66,10 +64,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@v3
- uses: actions/setup-node@v1
with:
node-version: 16.14.2
- uses: actions/cache@v3
- uses: actions/cache@v1
id: cache-modules
with:
path: src-demo/node_modules
Expand All @@ -82,8 +80,8 @@ jobs:
working-directory: ./src-demo
- name: Deploy to GH Pages 馃殌
if: github.ref == 'refs/heads/master'
uses: JamesIves/github-pages-deploy-action@v4
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: src-demo/build # The folder the action should deploy.
FOLDER: src-demo/build # The folder the action should deploy.

0 comments on commit 12319e1

Please sign in to comment.