Skip to content

Commit

Permalink
Merge branch 'master' into ems-compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonofdeath authored Feb 3, 2025
2 parents 2e78a24 + 8ef904c commit 15eec2f
Show file tree
Hide file tree
Showing 31 changed files with 547 additions and 319 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
permissions:
contents: write
pull-requests: write
packages: write

jobs:
lint:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.13.0]
node-version: [16.20.0]
steps:
- uses: actions/checkout@v2
- name: Install and run lint
Expand All @@ -28,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.13.0]
node-version: [16.20.0]
test-script: ["ci:test-unit", "ci:test-e2e-layouts","ci:test-e2e-styleParams", "ci:test-e2e-integration"]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
Expand All @@ -51,10 +55,13 @@ jobs:
needs: [lint, tests]
strategy:
matrix:
node-version: [16.13.0]
node-version: [16.20.0]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.PAT_TOKEN }}
fetch-depth: 0
- name: Install, build, configure git and lerna publish
uses: actions/setup-node@v2
with:
Expand All @@ -71,6 +78,7 @@ jobs:
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
- name: Push to master
if: github.event_name == 'push'
# run: echo "this is a push to master"
Expand All @@ -80,19 +88,21 @@ jobs:
npm run changelog
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
- name: Push to pull request
if: github.event_name == 'pull_request' && github.actor != 'dependabot'
# run: echo "PULL REQUEST PUSH"
run: lerna publish --canary --preid ${{ github.sha }} --yes --registry https://registry.npmjs.org
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
update-playground:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
needs: [lint, tests]
strategy:
matrix:
node-version: [16.13.0]
node-version: [16.20.0]
steps:
- uses: actions/checkout@v2
- name: update-playground
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.0
16.20.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Pro Gallery
</h1>

Blazing fast & beautiful galleries built with React. [Try it out now.](https://pro-gallery.surge.sh)
Blazing fast & beautiful galleries built with React. [Try it out now.](https://pro-gallery.surge.sh).
- Responsive
- Lazy loading
- Infinite Scroll
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"packages": [
"packages/*"
],
"version": "5.0.104"
"version": "5.0.112"
}
Loading

0 comments on commit 15eec2f

Please sign in to comment.