From cf6cbc5caf0561461401b11bad7b211c85c0be06 Mon Sep 17 00:00:00 2001 From: Randall Keur Date: Mon, 18 Nov 2024 10:19:20 -0500 Subject: [PATCH 1/2] add Adrian as codeowner so it can be him or core-enablement team to approve PRs and updates to testing --- .github/CODEOWNERS | 3 ++- .github/workflows/sdk_validation.yaml | 24 +++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index efb61af..75aedb4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ -* @goshippo/core-enablement \ No newline at end of file +* @goshippo/core-enablement +* @AdrianCollinsShippo \ No newline at end of file diff --git a/.github/workflows/sdk_validation.yaml b/.github/workflows/sdk_validation.yaml index 477e22a..4d49bd0 100644 --- a/.github/workflows/sdk_validation.yaml +++ b/.github/workflows/sdk_validation.yaml @@ -1,4 +1,5 @@ name: Validate + permissions: contents: write id-token: write @@ -17,23 +18,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 concurrency: - group: php-sdk-check + group: php-sdk-check-${{ github.event.pull_request.number }} steps: - - name: Authenticate with AWS - uses: goshippo/shippo-action-workflows/.github/actions/aws_auth@v1.1.0 - with: - environment: dev-main - oidc-name: shippo-php-sdk-pipeline - login-to-ecr: false - - - name: Get Speakeasy Secrets Manager - uses: aws-actions/aws-secretsmanager-get-secrets@v2 - with: - secret-ids: | - dev-main-speakeasy-api-key - name-transformation: uppercase - parse-json-secrets: true - - name: Check out repository uses: actions/checkout@v4 @@ -41,7 +27,7 @@ jobs: id: setup_php uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' - name: cache dependencies uses: actions/cache@v4 @@ -54,6 +40,6 @@ jobs: make install - name: Check - run: make check + run: make check env: - SHIPPO_TOKEN: ${{ env.DEV_MAIN_SPEAKEASY_API_KEY_SHIPPO_TOKEN }} + SHIPPO_TOKEN: ${{ secrets.SHIPPO_TOKEN }} From e33ee4e5ce8d5a064c59a1547a4831be22e996de Mon Sep 17 00:00:00 2001 From: Randall Keur Date: Mon, 18 Nov 2024 15:34:55 -0500 Subject: [PATCH 2/2] update php version and remove .idea folder --- .idea/inspectionProfiles/Project_Default.xml | 6 - .idea/misc.xml | 6 - .idea/modules.xml | 8 - .idea/php-test-framework.xml | 14 -- .idea/php.xml | 64 ------- .idea/phpunit.xml | 10 - .idea/shippo-php-sdk.iml | 55 ------ .idea/vcs.xml | 6 - .idea/workspace.xml | 181 ------------------- composer.json | 2 +- 10 files changed, 1 insertion(+), 351 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php-test-framework.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/phpunit.xml delete mode 100644 .idea/shippo-php-sdk.iml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 551d679..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7299175..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 92cdee6..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml deleted file mode 100644 index a46053c..0000000 --- a/.idea/php-test-framework.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index b47f00c..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml deleted file mode 100644 index 4f8104c..0000000 --- a/.idea/phpunit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/shippo-php-sdk.iml b/.idea/shippo-php-sdk.iml deleted file mode 100644 index e550296..0000000 --- a/.idea/shippo-php-sdk.iml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 859436b..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - $PROJECT_DIR$/composer.json - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "customColor": "", - "associatedIndex": 1 -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1718647319602 - - - - - - - true - - - -