Skip to content

Commit ea25adf

Browse files
authored
Merge pull request #18 from adobe/feature/NO-TICKET-fix-failing-npm-ci-action
Update all dependencies to latest
2 parents 174af23 + 3fbd16e commit ea25adf

8 files changed

Lines changed: 7230 additions & 9045 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v1
42+
uses: github/codeql-action/init@v3
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v1
53+
uses: github/codeql-action/autobuild@v3
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v1
67+
uses: github/codeql-action/analyze@v3

.github/workflows/nodejs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest]
17-
node-version: [16.x]
17+
node-version: [20.x]
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121
- name: Use Node.js ${{ matrix.node-version }}
22-
uses: actions/setup-node@v1
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
- run: npm i

.github/workflows/on-push-publish-to-npm.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@ name: on-push-publish-to-npm
22
on:
33
push:
44
branches:
5-
- main # Change this if not your default branch
5+
- main
66
paths:
77
- 'package.json'
88
jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/setup-node@v1
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
1414
with:
15-
node-version: 16
15+
node-version: 20
1616
- run: npm install
1717
- run: npm test
18-
- uses: JS-DevTools/npm-publish@v1
18+
- uses: JS-DevTools/npm-publish@v3
1919
with:
2020
token: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
21-
access: 'public'

.github/workflows/version-bump-publish.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
name: checkout
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- run: |
2020
git config user.name github-actions
2121
git config user.email github-actions@github.com
22-
- uses: actions/setup-node@v1
22+
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 16
24+
node-version: 20
2525
- run: |
2626
npm install
2727
npm test
@@ -30,8 +30,7 @@ jobs:
3030
run: |
3131
npm version ${{ github.event.inputs.level }}
3232
git push
33-
- uses: JS-DevTools/npm-publish@v1
33+
- uses: JS-DevTools/npm-publish@v3
3434
with:
3535
token: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
3636
tag: ${{ github.event.inputs.tag }}
37-
access: 'public'

e2e/README.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ To run the e2e test you'll need these env variables set:
77
2. `AEM_GRAPHQL_ENDPOINT` (if different from default `content/graphql/endpoint.gql`)
88
3. `AEM_TOKEN` (or `AEM_USER` and `AEM_PASS`)
99

10+
### Example
11+
```bash
12+
AEM_HOST_URI=http://localhost:4502
13+
AEM_GRAPHQL_ENDPOINT=/content/cq:graphql/wknd-shared/endpoint.json
14+
AEM_USER=admin
15+
AEM_PASS=admin
16+
```
1017
## Run
1118

1219
`npm run e2e`
@@ -16,4 +23,20 @@ To run the e2e test you'll need these env variables set:
1623
The tests cover:
1724

1825
1. Malformed required params
19-
2. `read` APIs
26+
2. All APIs
27+
- persistQuery
28+
- listPersistedQueries
29+
- runPersistedQuery
30+
- runQuery
31+
32+
## Local AEM setup
33+
34+
1. Navigate to the [Software Distribution Portal](https://experience.adobe.com/#/downloads/content/software-distribution/en/aemcloud.html?fulltext=AEM*+SDK*&orderby=%40jcr%3Acontent%2Fjcr%3AlastModified&orderby.sort=desc&layout=list&p.offset=0&p.limit=1) > AEM as a Cloud Service and download the latest version of the AEM SDK.
35+
2. Start AEM
36+
```
37+
java -jar aem-author-p4502.jar
38+
```
39+
3. Download the latest compiled AEM Package for WKND Site: [aem-guides-wknd.all-x.x.x.zip](https://github.com/adobe/aem-guides-wknd/releases/latest).
40+
4. Install downloaded Demo Content package
41+
5. Configure ENV variables
42+
6. Run e2e test

e2e/e2e.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const queryString = `
2828
}
2929
`
3030
let sdk = {}
31-
const persistedName = 'wknd/persist-query-name'
32-
const existingQueryName = 'wknd/adventures-all'
31+
const persistedName = 'wknd-shared/persist-query-name'
32+
const existingQueryName = 'wknd-shared/adventures-all'
3333

3434
beforeEach(() => {
3535
sdk = new AEMHeadless({

0 commit comments

Comments
 (0)