Skip to content

Commit fef20f8

Browse files
deepesshdeepessh
committed
Merge remote-tracking branch 'origin/main' into get-credentials-phase2
2 parents 964add6 + 62fad4d commit fef20f8

File tree

6 files changed

+99
-43
lines changed

6 files changed

+99
-43
lines changed

‎.github/workflows/algolia-indexing.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: Search Indexing
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
mode:
7+
description: 'Type of indexing. "index" to push to Algolia, "console" for dry run.'
8+
required: true
9+
default: "index"
10+
type: choice
11+
options:
12+
- console
13+
- index
14+
15+
jobs:
16+
build-and-index:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Setup Node v18 for Yarn v4
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: "18.19.0" # Current LTS version
26+
27+
- name: Enable Corepack for Yarn
28+
run: corepack enable
29+
30+
- name: Install Dependencies
31+
run: yarn install
32+
env:
33+
YARN_ENABLE_IMMUTABLE_INSTALLS: false
34+
35+
- name: Build site
36+
run: yarn build
37+
38+
env:
39+
NODE_OPTIONS: "--max_old_space_size=8192"
40+
PREFIX_PATHS: true # equivalent to --prefix-paths flag for 'gatsby build'
41+
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
REPO_OWNER: ${{ github.repository_owner }}
43+
REPO_NAME: ${{ github.event.repository.name }}
44+
REPO_BRANCH: ${{ github.ref_name }}
45+
GATSBY_ALGOLIA_APPLICATION_ID: ${{ secrets.AIO_ALGOLIA_APPLICATION_ID }}
46+
GATSBY_ALGOLIA_SEARCH_API_KEY: ${{ secrets.AIO_ALGOLIA_SEARCH_API_KEY }}
47+
ALGOLIA_WRITE_API_KEY: ${{ secrets.AIO_ALGOLIA_WRITE_API_KEY }}
48+
ALGOLIA_INDEXATION_MODE: ${{ github.event.inputs.mode || 'index' }}
49+
GATSBY_ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
50+
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
51+
GATSBY_SITE_DOMAIN_URL: https://developer.adobe.com

‎.github/workflows/deploy.yml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ on:
44
workflow_dispatch:
55
inputs:
66
env:
7-
description: 'Deploy to (dev|prod|dev prod)'
7+
description: "Deploy to (dev|prod|dev prod)"
88
required: true
9-
default: 'dev'
9+
default: "dev"
1010
clean:
11-
description: 'Clean cache (yes|no)'
11+
description: "Clean cache (yes|no)"
1212
required: true
13-
default: 'no'
13+
default: "no"
1414
excludeSubfolder:
15-
description: 'Exclude a subfolder from deletion'
15+
description: "Exclude a subfolder from deletion"
1616
required: false
17-
default: ''
17+
default: ""
18+
index-mode:
19+
description: 'Type of indexing. "index" to push to Algolia, "console" for dry run.'
20+
required: true
21+
default: "index"
22+
type: choice
23+
options:
24+
- console
25+
- index
1826
jobs:
1927
set-state:
2028
runs-on: ubuntu-latest
@@ -39,7 +47,7 @@ jobs:
3947
result-encoding: string
4048
- name: Get branch name
4149
shell: bash
42-
run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
50+
run: echo "branch=${GITHUB_REF#refs/heads/}" >> "$GITHUB_OUTPUT"
4351
id: get_branch
4452

4553
echo-state:
@@ -81,7 +89,7 @@ jobs:
8189
- name: Setup Node v16 for Yarn v3
8290
uses: actions/setup-node@v3
8391
with:
84-
node-version: '16.15.0' # Current LTS version
92+
node-version: "16.15.0" # Current LTS version
8593

8694
- name: Enable Corepack for Yarn v3
8795
run: corepack enable
@@ -123,7 +131,7 @@ jobs:
123131
PATH_PREFIX: ${{ needs.set-state.outputs.path_prefix }}
124132
GATSBY_ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_DEV_SRC }}
125133
GATSBY_ADDITIONAL_ADOBE_ANALYTICS_ACCOUNTS: ${{ secrets.AIO_REPORT_SUITE_DEV}}
126-
GATSBY_ADOBE_ANALYTICS_ENV: 'dev'
134+
GATSBY_ADOBE_ANALYTICS_ENV: "dev"
127135
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128136
REPO_OWNER: ${{ github.event.repository.owner.login }}
129137
REPO_NAME: ${{ github.event.repository.name }}
@@ -140,25 +148,24 @@ jobs:
140148
GATSBY_ALGOLIA_API_KEY: ${{ secrets.AIO_ALGOLIA_API_KEY }}
141149
GATSBY_ALGOLIA_INDEX_ALL_SRC: ${{ secrets.AIO_ALGOLIA_INDEX_ALL_SRC }}
142150
GATSBY_ALGOLIA_SEARCH_INDEX: ${{ secrets.AIO_ALGOLIA_SEARCH_INDEX }}
151+
GATSBY_ALGOLIA_INDEX_ENV_PREFIX: ${{ secrets.AIO_ALGOLIA_INDEX_ENV_PREFIX }}
143152
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
153+
GATSBY_SITE_DOMAIN_URL: https://developer-stage.adobe.com
144154

145155
- name: Deploy
146156
uses: AdobeDocs/static-website-deploy@master
147157
with:
148-
enabled-static-website: 'true'
149-
source: 'public'
158+
enabled-static-website: "true"
159+
source: "public"
150160
target: ${{ needs.set-state.outputs.path_prefix }}
151161
connection-string: ${{ secrets.AIO_AZURE_DEV_CONNECTION_STRING }}
152-
remove-existing-files: 'true'
162+
remove-existing-files: "true"
153163
exclude-subfolder: ${{ needs.set-state.outputs.exclude_subfolder }}
154-
- name: Delay purge
155-
run: sleep 60s
156-
shell: bash
157164
- name: Purge Fastly Cache
158165
uses: AdobeDocs/gatsby-fastly-purge-action@master
159166
with:
160167
fastly-token: ${{ secrets.AIO_FASTLY_TOKEN }}
161-
fastly-url: '${{ secrets.AIO_FASTLY_DEV_URL}}${{ needs.set-state.outputs.path_prefix }}'
168+
fastly-url: "${{ secrets.AIO_FASTLY_DEV_URL}}${{ needs.set-state.outputs.path_prefix }}"
162169

163170
pre-build-production:
164171
needs: [set-state]
@@ -186,7 +193,7 @@ jobs:
186193
- name: Setup Node v16 for Yarn v3
187194
uses: actions/setup-node@v3
188195
with:
189-
node-version: '16.15.0' # Current LTS version
196+
node-version: "16.15.0" # Current LTS version
190197

191198
- name: Enable Corepack for Yarn v3
192199
run: corepack enable
@@ -228,7 +235,7 @@ jobs:
228235
PATH_PREFIX: ${{ needs.set-state.outputs.path_prefix }}
229236
GATSBY_ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_PROD_SRC }}
230237
GATSBY_ADDITIONAL_ADOBE_ANALYTICS_ACCOUNTS: ${{ secrets.AIO_REPORT_SUITE_PROD }}
231-
GATSBY_ADOBE_ANALYTICS_ENV: 'production'
238+
GATSBY_ADOBE_ANALYTICS_ENV: "production"
232239
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
233240
REPO_OWNER: ${{ github.event.repository.owner.login }}
234241
REPO_NAME: ${{ github.event.repository.name }}
@@ -244,25 +251,24 @@ jobs:
244251
GATSBY_ALGOLIA_APP_ID: ${{ secrets.AIO_ALGOLIA_APP_ID }}
245252
GATSBY_ALGOLIA_API_KEY: ${{ secrets.AIO_ALGOLIA_API_KEY }}
246253
ALGOLIA_WRITE_API_KEY: ${{ secrets.AIO_ALGOLIA_WRITE_API_KEY }}
247-
ALGOLIA_INDEXATION_MODE: ${{ secrets.AIO_ALGOLIA_INDEXATION_MODE }}
248-
ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
254+
ALGOLIA_INDEXATION_MODE: ${{ github.event.inputs.index-mode || 'index' }}
255+
GATSBY_ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
249256
GATSBY_ALGOLIA_INDEX_ALL_SRC: ${{ secrets.AIO_ALGOLIA_INDEX_ALL_SRC }}
250257
GATSBY_ALGOLIA_SEARCH_INDEX: ${{ secrets.AIO_ALGOLIA_SEARCH_INDEX }}
258+
GATSBY_ALGOLIA_INDEX_ENV_PREFIX: ${{ secrets.AIO_ALGOLIA_INDEX_ENV_PREFIX }}
251259
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
260+
GATSBY_SITE_DOMAIN_URL: https://developer.adobe.com
252261
- name: Deploy
253262
uses: AdobeDocs/static-website-deploy@master
254263
with:
255-
enabled-static-website: 'true'
256-
source: 'public'
264+
enabled-static-website: "true"
265+
source: "public"
257266
target: ${{ needs.set-state.outputs.path_prefix }}
258267
connection-string: ${{ secrets.AIO_AZURE_PROD_CONNECTION_STRING }}
259-
remove-existing-files: 'true'
268+
remove-existing-files: "true"
260269
exclude-subfolder: ${{ needs.set-state.outputs.exclude_subfolder }}
261-
- name: Delay purge
262-
run: sleep 60s
263-
shell: bash
264270
- name: Purge Fastly Cache
265271
uses: AdobeDocs/gatsby-fastly-purge-action@master
266272
with:
267273
fastly-token: ${{ secrets.AIO_FASTLY_TOKEN }}
268-
fastly-url: '${{ secrets.AIO_FASTLY_PROD_URL }}${{ needs.set-state.outputs.path_prefix }}'
274+
fastly-url: "${{ secrets.AIO_FASTLY_PROD_URL }}${{ needs.set-state.outputs.path_prefix }}"

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"url": "https://github.com/icaraps"
1313
},
1414
"dependencies": {
15-
"@adobe/gatsby-theme-aio": "4.14.0-rc2",
16-
"@adobe/react-spectrum": "^3.35.1",
15+
"@adobe/gatsby-theme-aio": "^4.14.4",
1716
"gatsby": "4.22.0",
1817
"react": "^17.0.2",
1918
"react-dom": "^17.0.2"

‎src/pages/guides/authentication/UserAuthentication/IMS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Parameters can be sent in the body or as query parameters. Passing parameters in
247247

248248
|Parameter|Mandatory|Description|
249249
|---|---|---|
250-
|`authorization_code`|Yes|The value of the `code` query/fragment parameter returned in the callback request from the autorize step |
250+
|`code`|Yes|The value of the `code` query/fragment parameter returned in the callback request from the autorize step |
251251
|`grant_type`|Yes|Value should always be `authorization_code`|
252252
|`authorization`| Required for confidential clients|Basic Authorization header.<br/><br/>`Authorization: Basic Base64(clientId:clientSecret)`|
253253
|`client_id`|Required for PUBLIC clients|The Client ID obtained from the [Adobe Developer Console](/console)|

‎src/pages/guides/projects/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Furthermore, you can sort the Projects based on created date, last modified date
5353

5454
You can filter down the list of Projects to find your Projects quickly. You can filter the list of Projects using the following filters:
5555

56-
1. By Text: You can filter Projects by ID, title, description, workspace, IMS client ID, technical account ID, event registration id, plugin id, or Runtime namespace.
56+
1. By Text: You can filter Projects by ID, title, description, workspace, IMS client ID, technical account ID or email, event registration id, plugin id, or Runtime namespace.
5757
2. By who created or modified the Project
5858
3. By what a Project Contains (APIs, Event Providers, and Plugins)
5959
4. By whether a Project requires your attention

‎yarn.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ __metadata:
4040
languageName: node
4141
linkType: hard
4242

43-
"@adobe/gatsby-theme-aio@npm:4.14.0-rc2":
44-
version: 4.14.0-rc2
45-
resolution: "@adobe/gatsby-theme-aio@npm:4.14.0-rc2"
43+
"@adobe/gatsby-theme-aio@npm:^4.14.4":
44+
version: 4.14.4
45+
resolution: "@adobe/gatsby-theme-aio@npm:4.14.4"
4646
dependencies:
4747
"@adobe/focus-ring-polyfill": ^0.1.5
4848
"@adobe/gatsby-source-github-file-contributors": ^0.3.1
4949
"@adobe/prism-adobe": ^1.0.3
50+
"@adobe/react-spectrum": ^3.35.1
5051
"@emotion/react": ^11.10.4
5152
"@loadable/component": ^5.15.2
5253
"@mdx-js/mdx": 1.6.22
@@ -138,7 +139,7 @@ __metadata:
138139
gatsby: ^4.22.0
139140
react: ^17.0.2
140141
react-dom: ^17.0.2
141-
checksum: f2f1650b837c113b67ae3ed03053e953096fffe018cfec3294189436daaaf552803b7d251c4027443b7940f7060be9af0843c2a94a989d9e8e2fd14cc60a302c
142+
checksum: 846ee1128ccfee37bb36313ee594349369bba472f93ca7f6b6142b7ede79842f808f3458659abbbe7972171166a14674aa1860b8ca7539c1300a804f3794b54d
142143
languageName: node
143144
linkType: hard
144145

@@ -1991,11 +1992,11 @@ __metadata:
19911992
linkType: hard
19921993

19931994
"@babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
1994-
version: 7.24.6
1995-
resolution: "@babel/runtime@npm:7.24.6"
1995+
version: 7.24.8
1996+
resolution: "@babel/runtime@npm:7.24.8"
19961997
dependencies:
19971998
regenerator-runtime: ^0.14.0
1998-
checksum: 44d95ca743898fed31b4cefef31de6fd3cf7906e94493368e9d6538289cc52c6c46185205d9c01d38466a5b3f673550f80892d30b1ed02a2c13e704863a8cc48
1999+
checksum: 6b1e4230580f67a807ad054720812bbefbb024cc2adc1159d050acbb764c4c81c7ac5f7a042c48f578987c5edc2453c71039268df059058e9501fa6023d764b0
19992000
languageName: node
20002001
linkType: hard
20012002

@@ -7535,11 +7536,11 @@ __metadata:
75357536
linkType: hard
75367537

75377538
"@swc/helpers@npm:^0.5.0":
7538-
version: 0.5.11
7539-
resolution: "@swc/helpers@npm:0.5.11"
7539+
version: 0.5.12
7540+
resolution: "@swc/helpers@npm:0.5.12"
75407541
dependencies:
75417542
tslib: ^2.4.0
7542-
checksum: 5d85e641d993264f38871bf53e7509da959cdff7646a40d876153291146b9d0aa701518546e5bfef18fa17c5944333bbeb66c2f0d7a570e8c5535d0937d76bd9
7543+
checksum: 293c0cb8f41804f94beb04a764bbcfaf316707ec43947713154ac66311590299446bf9b96ab253ce59ce9e435a0edc8cc2bf93f88dc3989f9241271507dd5fe9
75437544
languageName: node
75447545
linkType: hard
75457546

@@ -8407,8 +8408,7 @@ __metadata:
84078408
version: 0.0.0-use.local
84088409
resolution: "adobe-dev-console@workspace:."
84098410
dependencies:
8410-
"@adobe/gatsby-theme-aio": 4.14.0-rc2
8411-
"@adobe/react-spectrum": ^3.35.1
8411+
"@adobe/gatsby-theme-aio": ^4.14.4
84128412
gatsby: 4.22.0
84138413
react: ^17.0.2
84148414
react-dom: ^17.0.2

0 commit comments

Comments
 (0)