Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/interop/authzen-inte…
Browse files Browse the repository at this point in the history
…rop-website/webpack-5.94.0
  • Loading branch information
ogazitt authored Sep 15, 2024
2 parents c784dc0 + 4e0fbba commit 7f28d13
Show file tree
Hide file tree
Showing 4 changed files with 191 additions and 58 deletions.
36 changes: 21 additions & 15 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
with:
ruby-version: '3.1'
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install kramdown-rfc
Expand All @@ -33,12 +33,12 @@ jobs:
# - name: Render Authz API 1.0 revision 00 Text
# run: xml2rfc api/authorization-api-1_0_00.xml --text
# - name: Upload Authz API 1.0 revision 00 artifact
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# with:
# name: output
# path: |
# authorization-api-1_0_00.html
# api/authorization-api-1_0.xml
# api/authorization-api-1_0_00.xml

- name: Convert Authz API 1.0 revision 01 to rfc xml
run: kramdown-rfc2629 api/authorization-api-1_0_01.md > api/authorization-api-1_0_01.xml
Expand All @@ -49,9 +49,9 @@ jobs:
- name: Render Authz API 1.0 revision 01 Text
run: xml2rfc api/authorization-api-1_0_01.xml --text
- name: Upload Authz API 1.0 revision 01 artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: output
name: authorization-api-1_0_01
path: |
index.html
authorization-api-1_0_01.html
Expand All @@ -64,9 +64,9 @@ jobs:
- name: Render Authz API 1.1 revision 01 Text
run: xml2rfc api/authorization-api-1_1_01.xml --text
- name: Upload Authz API 1.1 revision 01 artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: output
name: authorization-api-1_1_01
path: |
authorization-api-1_1_01.html
api/authorization-api-1_1_01.xml
Expand All @@ -78,7 +78,7 @@ jobs:
# - name: Render Authz API Original Text
# run: xml2rfc api/authorization-api-1_0-original.xml --text
# - name: Upload Authz API Original artifact
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# with:
# name: output
# path: |
Expand All @@ -92,9 +92,9 @@ jobs:
- name: Render Authz Design Patterns Text
run: xml2rfc patterns/AuthorizationDesignPatterns.xml --text
- name: Upload Authz Design Patterns artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: output
name: patterns-doc
path: |
patterns.html
patterns/AuthorizationDesignPatterns.xml
Expand All @@ -110,13 +110,19 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Download artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: output
pattern: authorization-api-*
path: .
merge-multiple: true
- name: Download artifact - pattern document
uses: actions/download-artifact@v4
with:
name: patterns-doc
- name: Upload pages artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: .
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
14 changes: 7 additions & 7 deletions interop/authzen-todo-application/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2899,7 +2899,7 @@ brace-expansion@^2.0.1:
dependencies:
balanced-match "^1.0.0"

braces@^3.0.1, braces@~3.0.2:
braces@^3.0.3, braces@~3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
Expand Down Expand Up @@ -6110,12 +6110,12 @@ methods@~1.1.2:
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=

micromatch@^4.0.2, micromatch@^4.0.4:
version "4.0.4"
resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
dependencies:
braces "^3.0.1"
picomatch "^2.2.3"
braces "^3.0.3"
picomatch "^2.3.1"

[email protected]:
version "0.2.0"
Expand Down Expand Up @@ -6649,7 +6649,7 @@ picocolors@^1.0.0:
resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
version "2.3.1"
resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
Expand Down
4 changes: 2 additions & 2 deletions interop/authzen-todo-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"author": "Omri Gazitt <[email protected]>",
"license": "MIT",
"dependencies": {
"axios": "^1.6.7",
"axios": "^1.7.4",
"cli-color": "^2.0.4",
"cors": "^2.8.5",
"dotenv": "^16.0.0",
"dotenv-expand": "^9.0.0",
"express": "^4.19.2",
"express": "^4.20.0",
"express-jwt": "8.4.1",
"jwks-rsa": "3.0.0",
"lodash": "^4.17.21",
Expand Down
Loading

0 comments on commit 7f28d13

Please sign in to comment.