From 03f18f680f43e8b953509acb33ad7713bb58f787 Mon Sep 17 00:00:00 2001 From: Dmytro Shevtsov Date: Wed, 13 Dec 2023 10:29:22 -0600 Subject: [PATCH 1/2] Fix the failing GH workflows --- .github/workflows/github-pages.yml | 28 ++++++++++++++++++------ .github/workflows/index.yml | 28 +++++++++++------------- .github/workflows/publish.yml | 33 ++++++++++++----------------- .github/workflows/stage.yml | 34 +++++++++++------------------- .nvmrc | 1 + package.json | 14 ++++++------ 6 files changed, 67 insertions(+), 71 deletions(-) create mode 100644 .nvmrc diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 5f5fbefb..fe8c1b49 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -6,13 +6,27 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 - - name: Yarn Install - uses: bahmutov/npm-install@v1 - - name: Build - run: | - yarn build + uses: actions/checkout@v4 + + - name: Setup Node v16 + uses: actions/setup-node@v3 + with: + node-version-file: '.nvmrc' + cache: 'yarn' + cache-dependency-path: 'yarn.lock' + + - name: Enable Corepack for Yarn + run: corepack enable + + - name: Install Dependencies + run: yarn install + env: + YARN_ENABLE_IMMUTABLE_INSTALLS: false + + - name: Build site + run: yarn build env: + NODE_OPTIONS: "--max-old-space-size=8192" PREFIX_PATHS: true # works like --prefix-paths flag for 'gatsby build' PATH_PREFIX: ${{ github.event.repository.name }} ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_SRC }} @@ -25,6 +39,7 @@ jobs: GOOGLE_OAUTH_CLIENT_SECRET: ${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }} GOOGLE_DOCS_TOKEN: ${{ secrets.GOOGLE_DOCS_TOKEN }} GOOGLE_DOCS_FOLDER_ID: ${{ secrets.GOOGLE_DOCS_FOLDER_ID }} + - name: Deploy to GH Pages uses: JamesIves/github-pages-deploy-action@v4 with: @@ -32,6 +47,7 @@ jobs: branch: gh-pages # The branch the action should deploy to. folder: public # The folder the action should deploy. clean: true # Automatically remove deleted files from deploy branch + - name: GH Pages URL id: gh-pages-url run: | diff --git a/.github/workflows/index.yml b/.github/workflows/index.yml index 4c344db0..2a103f2b 100644 --- a/.github/workflows/index.yml +++ b/.github/workflows/index.yml @@ -18,33 +18,29 @@ jobs: build-and-index: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 - - name: Setup Node v16 for Yarn v3 + - name: Setup Node v16 uses: actions/setup-node@v3 with: - node-version: '16.15.0' # Current LTS version + node-version-file: '.nvmrc' + cache: 'yarn' + cache-dependency-path: 'yarn.lock' - - name: Enable Corepack for Yarn v3 + - name: Enable Corepack for Yarn run: corepack enable - - name: Install Yarn v3 - uses: borales/actions-yarn@v3 - with: - cmd: set version stable - - - name: Install dependencies - uses: borales/actions-yarn@v3 - with: - cmd: install + - name: Install Dependencies + run: yarn install env: YARN_ENABLE_IMMUTABLE_INSTALLS: false - name: Build site - uses: borales/actions-yarn@v3 - with: - cmd: build + run: yarn build + env: + NODE_OPTIONS: "--max_old_space_size=8192" PREFIX_PATHS: true # equivalent to --prefix-paths flag for 'gatsby build' REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPO_OWNER: ${{ github.repository_owner }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 09497e7b..3fcf9df9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: branch_short_ref: ${{ steps.get_branch.outputs.branch }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get pathPrefix uses: actions/github-script@v6 @@ -56,30 +56,25 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Setup Node v16 for Yarn v3 + - name: Setup Node v16 uses: actions/setup-node@v3 with: - node-version: '16.15.0' # Current LTS version - - - name: Enable Corepack for Yarn v3 + node-version-file: '.nvmrc' + cache: 'yarn' + cache-dependency-path: 'yarn.lock' + + - name: Enable Corepack for Yarn run: corepack enable - - - name: Install Yarn v3 - uses: borales/actions-yarn@v3 - with: - cmd: set version stable - + - name: Install Dependencies - uses: borales/actions-yarn@v3 + run: yarn install env: YARN_ENABLE_IMMUTABLE_INSTALLS: false - with: - cmd: install - + - name: Gatsby Cache - uses: actions/cache@v2 + uses: actions/cache@v3.3.2 with: path: | public @@ -89,9 +84,7 @@ jobs: ${{ needs.set-state.outputs.branch_short_ref }}-gatsby-cache- - name: Build site - uses: borales/actions-yarn@v3 - with: - cmd: build + run: yarn build env: NODE_OPTIONS: "--max_old_space_size=8192" PREFIX_PATHS: true # equivalent to --prefix-paths flag for 'gatsby build' diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index dd8c97d2..fd153926 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -6,7 +6,7 @@ on: clean: description: 'Clean cache (yes|no)' required: true - default: 'no' + default: 'yes' excludeSubfolder: description: 'Exclude a subfolder from deletion' required: false @@ -21,7 +21,7 @@ jobs: exclude_subfolder: ${{ github.event.inputs.excludeSubfolder }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get pathPrefix uses: actions/github-script@v6 @@ -67,30 +67,25 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Setup Node v16 for Yarn v3 + - name: Setup Node v16 uses: actions/setup-node@v3 with: - node-version: '16.15.0' # Current LTS version + node-version-file: '.nvmrc' + cache: 'yarn' + cache-dependency-path: 'yarn.lock' - - name: Enable Corepack for Yarn v3 + - name: Enable Corepack for Yarn run: corepack enable - - name: Install Yarn v3 - uses: borales/actions-yarn@v3 - with: - cmd: set version stable - - name: Install Dependencies - uses: borales/actions-yarn@v3 + run: yarn install env: YARN_ENABLE_IMMUTABLE_INSTALLS: false - with: - cmd: install - name: Gatsby Cache - uses: actions/cache@v2 + uses: actions/cache@v3.3.2 with: path: | public @@ -101,16 +96,11 @@ jobs: - name: Clean Cache if: needs.set-state.outputs.clean_cache == 'true' - uses: borales/actions-yarn@v3 - with: - cmd: clean + run: yarn clean - name: Build site - uses: borales/actions-yarn@v3 - with: - cmd: build + run: yarn build env: - NODE_OPTIONS: "--max_old_space_size=8192" PREFIX_PATHS: true # equivalent to --prefix-paths flag for 'gatsby build' PATH_PREFIX: ${{ needs.set-state.outputs.path_prefix }} GATSBY_ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_DEV_SRC }} diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..59ea99ee --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +16.20 diff --git a/package.json b/package.json index dde167a7..853b4d6f 100644 --- a/package.json +++ b/package.json @@ -12,15 +12,15 @@ "react-dom": "^17.0.2" }, "scripts": { - "start": "gatsby build && gatsby serve", - "start:prefix": "gatsby build --prefix-paths && gatsby serve --prefix-paths", - "dev": "gatsby develop", - "dev:https": "gatsby develop --https --host localhost.corp.adobe.com --port 9000", - "build": "gatsby build", - "serve": "gatsby serve", + "start": "NODE_OPTIONS='--max-old-space-size=8192' gatsby build && gatsby serve", + "start:prefix": "NODE_OPTIONS='--max-old-space-size=8192' gatsby build --prefix-paths && gatsby serve --prefix-paths", + "dev": "NODE_OPTIONS='--max-old-space-size=8192' gatsby develop", + "dev:https": "NODE_OPTIONS='--max-old-space-size=8192' gatsby develop --https --host localhost.corp.adobe.com --port 9000", + "build": "NODE_OPTIONS='--max-old-space-size=8192' gatsby build", + "serve": "NODE_OPTIONS='--max-old-space-size=8192' gatsby serve", "clean": "gatsby clean", "test": "remark src/pages --quiet --frail", - "lint": "docker run --rm -e RUN_LOCAL=true --env-file '.github/super-linter.env' -v \"$PWD\":/tmp/lint github/super-linter:slim-v4.10.1" + "lint": "docker run --rm -e RUN_LOCAL=true --env-file .github/super-linter.env -v \"$PWD\":/tmp/lint github/super-linter:slim-v4.10.1" }, "packageManager": "yarn@3.2.1", "devDependencies": { From 83d5a17dd68335063aa7035ce9df2ee99bee0725 Mon Sep 17 00:00:00 2001 From: Kevin Harper Date: Wed, 13 Dec 2023 11:38:11 -0600 Subject: [PATCH 2/2] Remove link to ASC extension --- src/pages/amazon-sales-channel/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/amazon-sales-channel/index.md b/src/pages/amazon-sales-channel/index.md index b7e3a7c7..167ef99e 100644 --- a/src/pages/amazon-sales-channel/index.md +++ b/src/pages/amazon-sales-channel/index.md @@ -22,7 +22,7 @@ Amazon Sales Channel on App Builder is based on an existing PHP extension (Amazo -This app is not intended or supported for production use. While the provided capabilities are robust, they are only to be used as a reference to build your own applications. Merchants looking to connect and synchronize their Amazon store with Commerce should use the existing [Amazon Sales Channel PHP extension](https://marketplace.magento.com/magento-module-amazon.html), which can be acquired through Commerce Marketplace, or implement another integration. +This app is not intended or supported for production use. While the provided capabilities are robust, they are only to be used as a reference to build your own applications. Merchants looking to connect and synchronize their Amazon store with Commerce should use the existing Amazon Sales Channel PHP extension, which can be acquired through Commerce Marketplace, or implement another integration. To install this app, clone the [aio-amazon-sales-channel](https://github.com/adobe/amazon-sales-channel-app-builder) repo and follow the procedures described in [Prequisites](prerequisites.md) and [Install the Amazon Sales Channel app](installation.md).