Skip to content

Commit

Permalink
Merge pull request #29 from itsrennyman/fix/typo
Browse files Browse the repository at this point in the history
Fix/typo
  • Loading branch information
Renato Pozzi committed Mar 24, 2023
2 parents e10bd85 + 9e8b0f4 commit f3daf50
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 3 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Test & Release CI

on:
push:
branches:
- main
- dev

jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Bootstrap Dependencies
run: npm run bootstrap

- name: Run Testing Suite
run: npm run lib:test

- name: Release Package
run: |
if [ ${{ github.base_ref }} = dev ]; then
npm run lib:bump:next
fi
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
push:
branches:
- main
- feat/v3
pull_request:
branches:
- main
- dev

jobs:
main:
Expand All @@ -18,4 +18,4 @@ jobs:
fetch-depth: 0

- run: npm run bootstrap
- run: npx run lib:test
- run: npm run lib:test
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"lib:build": "lerna run build --scope react-plock",
"lib:publish:next": "lerna publish from-package --dist-tag next",
"lib:publish:latest": "lerna publish from-package",
"lib:bump:next": "lerna version --conventional-commits --conventional-prerelease --preid beta --yes",
"demo:dev": "lerna run dev --scope demo",
"demo:build": "lerna run build --scope demo",
"demo:preview": "lerna run preview --scope demo"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-plock/src/Plock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function Masonry<T>({
display: "grid",
alignItems: "start",
gridColumnGap: gap,
gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr)`,
gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr))`,
}}
>
{dataColumns.map((column, idx) => (
Expand Down

0 comments on commit f3daf50

Please sign in to comment.