Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,27 @@ jobs:
aws-region: us-west-2

- name: Build the servers
run: cd test-server && make build-all-servers FILTER=ruby,go,cpp
run: cd test-server && make build-all-servers FILTER=ruby,go,cpp,php
env:
MAKEFLAGS: -j${{ steps.cpu-count.outputs.count }}
AWS_REGION: us-west-2

- name: Start the servers
run: cd test-server && make start-all-servers FILTER=ruby,go,cpp
run: cd test-server && make start-all-servers FILTER=ruby,go,cpp,php
env:
AWS_REGION: us-west-2
TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}

- name: Wait for servers to start
run: cd test-server && make wait-all-servers FILTER=ruby,go,cpp
run: cd test-server && make wait-all-servers FILTER=ruby,go,cpp,php
env:
AWS_REGION: us-west-2
TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}

- name: Run run-tests
run: cd test-server && make run-tests FILTER=ruby,go,cpp
run: cd test-server && make run-tests FILTER=ruby,go,cpp,php
env:
AWS_REGION: us-west-2
TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
Expand All @@ -194,7 +194,7 @@ jobs:
test-server/*/net-v3-server.log

- name: Stop the servers
run: cd test-server && make stop-servers FILTER=ruby,go,cpp
run: cd test-server && make stop-servers FILTER=ruby,go,cpp,php

- name: Upload results
if: always()
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
path = test-server/specification
url = git@github.com:awslabs/private-aws-encryption-sdk-specification-staging.git
branch = fire-egg-staging
[submodule "test-server/php-v2-transition-server/local-php-sdk"]
path = test-server/php-v2-transition-server/local-php-sdk
url = git@github.com:aws/private-aws-sdk-php-staging.git
branch = s3ec/transitional
[submodule "test-server/net-v2-v3-server/s3ec-net-v2"]
path = test-server/net-v2-v3-server/s3ec-net-v2
url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
Expand Down
1 change: 0 additions & 1 deletion test-server/php-v2-transition-server/local-php-sdk
Submodule local-php-sdk deleted from 8e2210
1 change: 1 addition & 0 deletions test-server/php-v2-transition-server/local-php-sdk

This file was deleted.

2 changes: 1 addition & 1 deletion test-server/php-v3-server/local-php-sdk
Loading