Skip to content

Commit 25b329c

Browse files
authored
Merge pull request #142 from supertokens/update/gha/use-new-versions-action
update: use new get-versions-from-repo action
2 parents 071c45e + 68953ac commit 25b329c

File tree

2 files changed

+44
-29
lines changed

2 files changed

+44
-29
lines changed

.github/workflows/auth-react-test-1.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ jobs:
2222
outputs:
2323
fdiVersions: ${{ steps.versions.outputs.fdiVersions }}
2424
webJsInterfaceVersion: ${{ steps.versions.outputs.webJsInterfaceVersion }}
25+
26+
authReactFdiVersionMap: ${{ steps.auth-react-versions.outputs.fdiVersions }}
27+
authReactWjiVersionMap: ${{ steps.auth-react-versions.outputs.webJsInterfaceVersions }}
28+
29+
nodeFdiVersionMap: ${{ steps.node-versions.outputs.fdiVersions }}
30+
2531
steps:
2632
- uses: actions/checkout@v4
2733

@@ -31,6 +37,21 @@ jobs:
3137
has-fdi: true
3238
has-web-js: true
3339

40+
- uses: supertokens/actions/get-versions-from-repo@main
41+
id: auth-react-versions
42+
with:
43+
repo: supertokens-auth-react
44+
github-token: ${{ secrets.GITHUB_TOKEN }}
45+
fdi-versions: ${{ steps.versions.outputs.fdiVersions }}
46+
wji-versions: '[${{ steps.versions.outputs.webJsInterfaceVersion }}]'
47+
48+
- uses: supertokens/actions/get-versions-from-repo@main
49+
id: node-versions
50+
with:
51+
repo: supertokens-node
52+
github-token: ${{ secrets.GITHUB_TOKEN }}
53+
fdi-versions: ${{ steps.versions.outputs.fdiVersions }}
54+
3455
setup-auth-react:
3556
runs-on: ubuntu-latest
3657
needs: define-versions
@@ -58,21 +79,21 @@ jobs:
5879
with:
5980
node-version: 20
6081

61-
- uses: supertokens/get-versions-action@main
62-
id: versions
63-
with:
64-
driver-name: node
65-
fdi-version: ${{ matrix.fdi-version }}
66-
fetch-frontend-versions: false
67-
web-js-interface-version: ${{ needs.define-versions.outputs.webJsInterfaceVersion }}
68-
env:
69-
SUPERTOKENS_API_KEY: ${{ secrets.SUPERTOKENS_API_KEY }}
82+
- id: repo-versions
83+
run: |
84+
authReactVersionFromFdi=$( echo '${{ needs.define-versions.outputs.authReactFdiVersionMap }}' | jq -r '.["${{ matrix.fdi-version }}"]' )
85+
authReactVersionFromWji=$( echo '${{ needs.define-versions.outputs.authReactWjiVersionMap }}' | jq -r '.["${{ matrix.fdi-version }}"]' )
86+
nodeVersion=$( echo '${{ needs.define-versions.outputs.nodeFdiVersionMap }}' | jq -r '.["${{ matrix.fdi-version }}"]' )
87+
88+
echo "authReactVersionFromFdi=${authReactVersionFromFdi}" >> $GITHUB_OUTPUT
89+
echo "authReactVersionFromWji=${authReactVersionFromWji}" >> $GITHUB_OUTPUT
90+
echo "nodeVersion=${nodeVersion}" >> $GITHUB_OUTPUT
7091
7192
- uses: supertokens/auth-react-testing-action/setup@main
7293
id: envs
7394
with:
74-
auth-react-version: ${{ steps.versions.outputs.webJsReactVersionXy }}
75-
node-sdk-version: ${{ steps.versions.outputs.nodeTag }}
95+
auth-react-version: ${{ steps.repo-versions.outputs.authReactVersionFromFdi }}
96+
node-sdk-version: ${{ steps.repo-versions.outputs.nodeVersion }}
7697
fdi-version: ${{ matrix.fdi-version }}
7798
use-common-app-and-test-server: "true"
7899
persist-workspace: "false"
@@ -81,7 +102,7 @@ jobs:
81102
- uses: actions/checkout@v4
82103
with:
83104
repository: supertokens/supertokens-node
84-
ref: ${{ steps.versions.outputs.nodeTag }}
105+
ref: ${{ steps.repo-versions.outputs.nodeVersion }}
85106
path: supertokens-node
86107

87108
- name: Copy over required dependencies

.github/workflows/auth-react-test-2.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,26 @@ jobs:
8282
has-cdi: true
8383
working-directory: supertokens-node
8484

85-
- uses: supertokens/get-versions-action@main
86-
id: versions
85+
- uses: supertokens/actions/get-versions-from-repo@main
86+
id: core-versions
8787
with:
88-
driver-name: node
89-
fdi-version: ${{ inputs.fdi-version }}
88+
repo: supertokens-core
89+
github-token: ${{ secrets.GITHUB_TOKEN }}
90+
cdi-versions: ${{ steps.node-cdi-versions.outputs.cdiVersions }}
9091

91-
- name: Get last Node CDI version
92-
id: last-node-cdi-version
92+
- name: Get core version from latest Node CDI version
93+
id: core-version
9394
run: |
94-
export lastVersion=$(echo '${{ steps.node-cdi-versions.outputs.cdiVersions }}' | jq -r '.[-1]')
95-
echo "lastNodeCdiVersion=$lastVersion" | tee -a "$GITHUB_OUTPUT" "$GITHUB_ENV"
95+
lastNodeCdiVersion=$(echo '${{ steps.node-cdi-versions.outputs.cdiVersions }}' | jq -r '.[-1]') | sed -e 's/"/\\"/g'
96+
coreVersion=$(echo '${{ steps.core-versions.outputs.cdiVersions }}' | jq -r ".[$lastNodeCdiVersion]")
9697
97-
- name: Get Core version
98-
id: core-version
99-
uses: supertokens/get-versions-action@main
100-
with:
101-
driver-name: node
102-
cdi-version: ${{ steps.last-node-cdi-version.outputs.lastNodeCdiVersion }}
103-
env:
104-
SUPERTOKENS_API_KEY: ${{ secrets.SUPERTOKENS_API_KEY }}
98+
echo "coreVersion=${coreVersion}" >> $GITHUB_OUTPUT
10599
106100
- name: Start core
107101
run: docker compose up --wait
108102
working-directory: supertokens-web-js
109103
env:
110-
SUPERTOKENS_CORE_VERSION: ${{ steps.core-version.outputs.coreVersionXy }}
104+
SUPERTOKENS_CORE_VERSION: ${{ steps.core-version.outputs.coreVersion }}
111105

112106
- uses: supertokens/auth-react-testing-action@main
113107
name: test ${{ matrix.spec }} for ${{ inputs.fdi-version }}

0 commit comments

Comments
 (0)