Skip to content

Commit 05c846a

Browse files
committed
Merge branch 'develop' into degroff/ENG-1/issue1
2 parents 74bdfff + 7cb106c commit 05c846a

14 files changed

Lines changed: 564 additions & 142 deletions

.github/workflows/deploy.yaml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
# Release to Savant or publish to Maven.
2-
# Only runs via manual workflow dispatch.
3-
4-
# Run locally with act:
5-
#
6-
# act pull_request [--input command=[command]] \
7-
# --platform fusionauth-standard=[ecr-repo-name]/fusionauth-standard:latest] \
8-
# --workflows ./.github/workflows/deploy.yaml \
9-
# --env-file <(aws configure export-credentials --profile [aws-profile] --format env)
10-
1+
---
112
name: Deploy
123

134
on:
@@ -21,21 +12,41 @@ on:
2112

2213
permissions:
2314
contents: read
15+
id-token: write
2416

2517
jobs:
2618
deploy:
27-
if: |
28-
github.event_name == 'workflow_dispatch' &&
29-
(inputs.command == 'release' || inputs.command == 'publish')
30-
runs-on: fusionauth-standard
19+
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
shell: /usr/bin/bash -l -e -o pipefail {0}
3123
steps:
3224
- name: checkout
3325
uses: actions/checkout@v4
3426

27+
- name: setup java
28+
uses: actions/setup-java@v4
29+
with:
30+
distribution: temurin
31+
java-version: 21
32+
java-package: jre
33+
34+
- name: install savant
35+
run: |
36+
curl -O https://repository.savantbuild.org/org/savantbuild/savant-core/2.0.0/savant-2.0.0.tar.gz
37+
tar xzvf savant-2.0.0.tar.gz
38+
savant-2.0.0/bin/sb --version
39+
SAVANT_PATH=$(realpath -s "./savant-2.0.0/bin")
40+
echo "${SAVANT_PATH}" >> $GITHUB_PATH
41+
mkdir -p ~/.savant/plugins
42+
cat << EOF > ~/.savant/plugins/org.savantbuild.plugin.java.properties
43+
21=${JAVA_HOME}
44+
EOF
45+
3546
- name: set aws credentials
3647
uses: aws-actions/configure-aws-credentials@v4
3748
with:
38-
role-to-assume: arn:aws:iam::752443094709:role/github-actions
49+
role-to-assume: arn:aws:iam::752443094709:role/gha-fusionauth-php-client
3950
role-session-name: aws-auth-action
4051
aws-region: us-west-2
4152

@@ -58,10 +69,8 @@ jobs:
5869
5970
- name: release to svn
6071
if: inputs.command == 'release'
61-
shell: bash -l {0}
6272
run: sb release
6373

6474
- name: publish to packagist
6575
if: inputs.command == 'publish'
66-
shell: bash -l {0}
6776
run: sb publish

build.savant

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* language governing permissions and limitations under the License.
1515
*/
1616

17-
project(group: "io.fusionauth", name: "fusionauth-php-client", version: "1.56.0", licenses: ["ApacheV2_0"]) {
17+
project(group: "io.fusionauth", name: "fusionauth-php-client", version: "1.58.0", licenses: ["ApacheV2_0"]) {
1818
workflow {
1919
fetch {
2020
cache()

docs/classes/FusionAuth-ClientResponse.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -622,12 +622,12 @@ <h4 class="phpdocumentor-element__name" id="method_wasSuccessful">
622622
<li class="phpdocumentor-on-this-page-section__title">Properties</li>
623623
<li>
624624
<ul class="phpdocumentor-list -clean">
625-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_errorResponse">$errorResponse</li>
626-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_exception">$exception</li>
627-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_method">$method</li>
628-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_request">$request</li>
629-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_status">$status</li>
630-
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_successResponse">$successResponse</li>
625+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_errorResponse">$errorResponse</a></li>
626+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_exception">$exception</a></li>
627+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_method">$method</a></li>
628+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_request">$request</a></li>
629+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_status">$status</a></li>
630+
<li class=""><a href="classes/FusionAuth-ClientResponse.html#property_successResponse">$successResponse</a></li>
631631
</ul>
632632
</li>
633633

docs/classes/FusionAuth-FormDataBodyHandler.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,8 +584,8 @@ <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
584584
<li class="phpdocumentor-on-this-page-section__title">Properties</li>
585585
<li>
586586
<ul class="phpdocumentor-list -clean">
587-
<li class=""><a href="classes/FusionAuth-FormDataBodyHandler.html#property_body">$body</li>
588-
<li class=""><a href="classes/FusionAuth-FormDataBodyHandler.html#property_bodyObject">$bodyObject</li>
587+
<li class=""><a href="classes/FusionAuth-FormDataBodyHandler.html#property_body">$body</a></li>
588+
<li class=""><a href="classes/FusionAuth-FormDataBodyHandler.html#property_bodyObject">$bodyObject</a></li>
589589
</ul>
590590
</li>
591591

0 commit comments

Comments
 (0)