Skip to content

Merge release 3.2.1 into 4.0.x #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c8d3a30
Update merge-me.yml (#403)
Spomky Sep 1, 2022
e98580b
Deps/remove phpasn1 (#415)
Spomky Dec 23, 2022
75ba775
Rebase for merge
Spomky Dec 27, 2022
8fe9bb9
Fixes incorrect RSA Keys PEM encoding (#420)
Spomky Dec 27, 2022
6878e5f
New Github Action: Tweet on release (#421)
Spomky Dec 27, 2022
ca05dab
Merge pull request #422 from web-token/3.1.x-merge-up-into-3.2.x_TNXx…
Spomky Dec 27, 2022
f59e6d5
Tweet Action version (#424)
Spomky Dec 27, 2022
52da412
CI/CD fixed (#425)
Spomky Dec 27, 2022
8e1e0fe
Update RSAKey.php (#427)
Spomky Dec 28, 2022
64f2c14
Update release-on-milestone-closed.yml
Spomky Dec 28, 2022
e767220
Update release-on-milestone-closed.yml
Spomky Dec 28, 2022
502f84e
Update tweet.yml
Spomky Dec 28, 2022
790ef2c
Merge pull request #428 from web-token/3.1.x-merge-up-into-3.2.x_kBlz…
Spomky Dec 28, 2022
6fc2a99
Bump laminas/automatic-releases from 1.23.0 to 1.24.0
dependabot[bot] Feb 1, 2023
29f836c
Merge pull request #429 from web-token/dependabot/github_actions/lami…
Spomky Feb 1, 2023
420ec60
Allow brick/math:0.11 (#430)
W0rma Feb 2, 2023
1403e77
Phpstan/Rector/ECS fixed (#431)
Spomky Feb 2, 2023
1945126
Merge pull request #432 from web-token/3.1.x-merge-up-into-3.2.x_c1tA…
Spomky Feb 2, 2023
f01e77f
Support PSR-20 (clock) (#433)
tscni Feb 13, 2023
050c8b3
Keyset as string or integer (#437)
Spomky Mar 11, 2023
77e7502
Merge branch '3.2.x' into 3.1.x-merge-up-into-3.2.x_y5PglacC
Spomky Mar 11, 2023
7761778
Merge pull request #438 from web-token/3.1.x-merge-up-into-3.2.x_y5Pg…
Spomky Mar 11, 2023
2ca75a4
CI/CD update (#443)
Spomky May 18, 2023
90a0abf
Fix PHPDoc (#444)
Spomky May 18, 2023
7f28580
Dicd/symplify (#445)
Spomky May 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.gitsplit.yml export-ignore
/monorepo-builder.php export-ignore
/CODE_OF_CONDUCT.md export-ignore
/deptrac.yaml export-ignore
/ecs.php export-ignore
/infection.json export-ignore
/Makefile export-ignore
/phpbench.json export-ignore
/phpstan.neon export-ignore
/phpstan-baseline.neon export-ignore
/phpunit.xml.dist export-ignore
/rector.php export-ignore
139 changes: 130 additions & 9 deletions .github/workflows/gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,137 @@ on:
push:
tags:
- '*'
release:
types: [published]

env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}

jobs:
gitsplit:
packages_split:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# define package to repository map
package:
-
local_path: 'src/Component/Core'
split_repository: 'jwt-core'
-
local_path: 'src/Component/Checker'
split_repository: 'jwt-checker'
-
local_path: 'src/Component/Signature'
split_repository: 'jwt-signature'
-
local_path: 'src/Component/Encryption'
split_repository: 'jwt-encryption'
-
local_path: 'src/Component/KeyManagement'
split_repository: 'jwt-key-mgmt'
-
local_path: 'src/Component/Console'
split_repository: 'jwt-console'
-
local_path: 'src/Component/NestedToken'
split_repository: 'jwt-nested-token'
-
local_path: 'src/Bundle/JoseFramework'
split_repository: 'jwt-bundle'
-
local_path: 'src/EncryptionAlgorithm/ContentEncryption/AESCBC'
split_repository: 'jwt-encryption-algorithm-aescbc'
-
local_path: 'src/EncryptionAlgorithm/ContentEncryption/AESGCM'
split_repository: 'jwt-encryption-algorithm-aesgcm'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/AESGCMKW'
split_repository: 'jwt-encryption-algorithm-aesgcmkw'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/AESKW'
split_repository: 'jwt-encryption-algorithm-aeskw'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/Direct'
split_repository: 'jwt-encryption-algorithm-dir'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/ECDHES'
split_repository: 'jwt-encryption-algorithm-ecdh-es'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/PBES2'
split_repository: 'jwt-encryption-algorithm-pbes2'
-
local_path: 'src/EncryptionAlgorithm/KeyEncryption/RSA'
split_repository: 'jwt-encryption-algorithm-rsa'
-
local_path: 'src/SignatureAlgorithm/ECDSA'
split_repository: 'jwt-signature-algorithm-ecdsa'
-
local_path: 'src/SignatureAlgorithm/EdDSA'
split_repository: 'jwt-signature-algorithm-eddsa'
-
local_path: 'src/SignatureAlgorithm/None'
split_repository: 'jwt-signature-algorithm-none'
-
local_path: 'src/SignatureAlgorithm/HMAC'
split_repository: 'jwt-signature-algorithm-hmac'
-
local_path: 'src/SignatureAlgorithm/RSA'
split_repository: 'jwt-signature-algorithm-rsa'
-
local_path: 'src/SignatureAlgorithm/Experimental'
split_repository: 'jwt-signature-algorithm-experimental'
-
local_path: 'src/EncryptionAlgorithm/Experimental'
split_repository: 'jwt-encryption-algorithm-experimental'
-
local_path: 'src/Ecc'
split_repository: 'jwt-util-ecc'
-
local_path: 'packs/encryption'
split_repository: 'encryption-pack'
-
local_path: 'packs/signature'
split_repository: 'signature-pack'

steps:
- name: checkout
run: git clone https://github.com/web-token/jwt-framework /home/runner/work/web-token/jwt-framework && cd /home/runner/work/web-token/jwt-framework
- name: Split repositories
run: docker run --rm -t -e GH_TOKEN -v /cache/gitsplit:/cache/gitsplit -v /home/runner/work/web-token/jwt-framework:/srv jderusse/gitsplit gitsplit
env:
GH_TOKEN: ${{ secrets.GITSPLIT_TOKEN }}
- uses: actions/checkout@v2

# no tag
-
if: "!startsWith(github.ref, 'refs/tags/')"
uses: "symplify/[email protected]"
with:
# ↓ split "src/*" directory
package_directory: '${{ matrix.package.local_path }}'

# ↓ into https://github.com/web-token/* repository
repository_organization: 'web-token'
repository_name: '${{ matrix.package.split_repository }}'

# [optional, with "github.com" as default]
#repository_host: git.private.com:1234

# ↓ the user signed under the split commit
user_name: "Florent Morselli"
user_email: "[email protected]"

# with tag
-
if: "startsWith(github.ref, 'refs/tags/')"
uses: "symplify/[email protected]"
with:
tag: ${GITHUB_REF#refs/tags/}

# ↓ split "src/*" directory
package_directory: '${{ matrix.package.local_path }}'

# ↓ into https://github.com/web-token/* repository
repository_organization: 'web-token'
repository_name: '${{ matrix.package.split_repository }}'

# [optional, with "github.com" as default]
#repository_host: git.private.com:1234

# ↓ the user signed under the split commit
user_name: "Florent Morselli"
user_email: "[email protected]"
Loading