Skip to content

Commit

Permalink
chore: merge master branch and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ghiscoding committed Dec 13, 2023
2 parents 81ecb69 + d5de49e commit e77b52b
Show file tree
Hide file tree
Showing 4 changed files with 307 additions and 205 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/publish-npm-latest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: 🏷️ Publish NPM Latest

on: workflow_dispatch
on:
workflow_dispatch:
inputs:
dryrun:
type: boolean
description: Dry-Run

permissions:
contents: write
Expand Down Expand Up @@ -55,6 +60,7 @@ jobs:
run: yarn run build

- name: OTP
if: ${{ inputs.dryrun != true }}
uses: step-security/wait-for-secrets@v1
id: wait-for-secrets
with:
Expand All @@ -63,7 +69,20 @@ jobs:
name: 'OTP to publish package'
description: 'OTP from authenticator app'
- name: "[dry-run] 🧪 GitHub Release / NPM Publish"
if: ${{ inputs.dryrun == true }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_CONFIG_PROVENANCE: true
run: |
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
npm whoami
npx release-it --ci --dry-run
- name: GitHub Release 🏷️ / NPM Publish 📦
if: ${{ inputs.dryrun != true }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -74,12 +93,14 @@ jobs:
npm whoami
npx release-it --ci --npm.otp=${{ steps.wait-for-secrets.outputs.OTP }}
- name: Website Dev Build
- name: Website Dev Build (served for Cypress)
if: ${{ inputs.dryrun != true }}
run: yarn build:demo

# deploy (re-publish) GitHub demo page with a Prod build but only when merging to "master" branch
# and the commit message contains the text "chore: release"
- name: Deploy to gh-pages
if: ${{ inputs.dryrun != true }}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2005,3 +2005,4 @@ All notable changes to this project will be documented in this file. See [Conven
* **query:** add `excludeFromQuery` prop and use it for Row Selection ([cda0e39](https://github.com/ghiscoding/aurelia-slickgrid/commit/cda0e39))
* **queryFilter:** add new "queryFieldFilter" and "queryFieldSorter" ([9d2aae1](https://github.com/ghiscoding/aurelia-slickgrid/commit/9d2aae1))
* **selectEditors:** add select grid editors ([#22](https://github.com/ghiscoding/aurelia-slickgrid/issues/22)) ([5bd7215](https://github.com/ghiscoding/aurelia-slickgrid/commit/5bd7215))

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-slickgrid",
"version": "6.6.4",
"version": "6.6.5",
"description": "Slickgrid components made available in Aurelia",
"keywords": [
"aurelia",
Expand Down
Loading

0 comments on commit e77b52b

Please sign in to comment.