Skip to content

Commit

Permalink
Merge pull request #6 from wadehammes/update-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
wadehammes authored Jul 12, 2022
2 parents 311f8c7 + 437ea13 commit 75a859d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ on:
- staging
jobs:
ci:
name: Lint/Test
name: Lint & Test
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
name: Checkout code
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.15.0
- name: Get Yarn cache directory
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache yarn and node_modules
uses: actions/cache@v2
uses: actions/cache@v3
id: node-cache
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
/home/runner/work/rhythm-marketing/rhythm-marketing/node_modules/
/home/runner/work/discogs-collection-filter/discogs-collection-filter/node_modules/
key: ${{ runner.os }}-yarn-node-${{ hashFiles('**/yarn.lock') }}
- name: Install dependencies
run: sudo yarn install --prefer-offline --immutable --frozen-lockfile
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@

name: create-release
on:
push:
tags:
- 'v*'
- "v*"

jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.WADES_PAT }}
- name: Reset Main
id: reset_main
run: |
echo ${{ github.ref }}
/usr/bin/git push origin ${{ github.ref }}:main
echo ${{ github.ref }}
/usr/bin/git push origin ${{ github.ref }}:main
- name: Generate changelog
id: changelog
uses: metcalfc/[email protected]
Expand All @@ -34,4 +33,4 @@ jobs:
release_name: Release ${{ github.ref }}
body: ${{ steps.changelog.outputs.changelog }}
draft: false
prerelease: false
prerelease: false

0 comments on commit 75a859d

Please sign in to comment.