Skip to content

Commit

Permalink
Merge pull request #1863 from Kajabi/develop
Browse files Browse the repository at this point in the history
Next Version Bump
  • Loading branch information
ju-Skinner authored Feb 23, 2024
2 parents d760745 + c95eeff commit 4f7fe28
Show file tree
Hide file tree
Showing 35 changed files with 432 additions and 660 deletions.
3 changes: 2 additions & 1 deletion .env.dist
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
KAJABI_PRODUCTS_PATH=
KAJABI_PRODUCTS_PATH="/home/username/path/to/kajabi-products"
NODE_OPTIONS="--openssl-legacy-provider"
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on:
on:
pull_request:
paths:
- 'package.json'
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Dependency Review
uses: actions/dependency-review-action@v3
with:
Expand Down Expand Up @@ -61,10 +61,10 @@ jobs:
GPL-1.0-only, GPL-1.0-or-later, GPL-1.0, GPL-2.0-only,
GPL-2.0-or-later, GPL-2.0, GPL-3.0-only, GPL-3.0-or-later, GPL-3.0,
QPL-1.0, Sleepycat
comment-summary-in-pr: true
comment-summary-in-pr: true
# ([String]). Block the pull request on these licenses (optional)
# Possible values: Any `spdx_id` value(s) from https://docs.github.com/en/rest/licenses

# ([String]). Skip these GitHub Advisory Database IDs during detection (optional)
# Possible values: Any valid GitHub Advisory Database ID from https://github.com/advisories
#allow-ghsas:
#allow-ghsas:
41 changes: 0 additions & 41 deletions .github/workflows/deploy.yml

This file was deleted.

57 changes: 49 additions & 8 deletions .github/workflows/lint-test-build.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,72 @@
name: Lint-Test-Build
on:
workflow_call:
workflow_dispatch:
pull_request:

jobs:
lint_test_build:
name: Lint, Test, Build
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ${{ fromJSON(vars.NODE_VERSIONS) }}
steps:
- name: Clone Sage-Lib Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node Version
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: ${{ matrix.node-version }}

- name: Install Yarn
run: npm install -g yarn
env:
NODE_VERSION: ${{ matrix.node-version }}
run: |
if [[ $NODE_VERSION == '18' ]]; then
NODE_OPTIONS=--openssl-legacy-provider npm install -g yarn
else
npm install -g yarn
fi
- name: Yarn Install
run: yarn install
env:
NODE_VERSION: ${{ matrix.node-version }}
run: |
if [[ $NODE_VERSION == '18' ]]; then
NODE_OPTIONS=--openssl-legacy-provider yarn install
else
yarn install
fi
- name: Yarn Lint
run: yarn lint
env:
NODE_VERSION: ${{ matrix.node-version }}
run: |
if [[ $NODE_VERSION == '18' ]]; then
NODE_OPTIONS=--openssl-legacy-provider yarn lint
else
yarn lint
fi
- name: Yarn Test
run: yarn test
env:
NODE_VERSION: ${{ matrix.node-version }}
run: |
if [[ $NODE_VERSION == '18' ]]; then
NODE_OPTIONS=--openssl-legacy-provider yarn test
else
yarn test
fi
- name: Yarn Build
run: yarn build
env:
NODE_VERSION: ${{ matrix.node-version }}
run: |
if [[ $NODE_VERSION == '18' ]]; then
NODE_OPTIONS=--openssl-legacy-provider yarn build
else
yarn build
fi
Loading

0 comments on commit 4f7fe28

Please sign in to comment.