shorter names
parent
ca169c7fb1
commit
2c812ea980
|
|
@ -49,7 +49,7 @@ jobs:
|
||||||
exclude:
|
exclude:
|
||||||
- targetPlatform: Android
|
- targetPlatform: Android
|
||||||
unityVersion: 2022.2.7f1
|
unityVersion: 2022.2.7f1
|
||||||
cloudRunnerCluster:
|
providerStrategy:
|
||||||
# - local-docker
|
# - local-docker
|
||||||
- local
|
- local
|
||||||
projectPath:
|
projectPath:
|
||||||
|
|
@ -109,7 +109,7 @@ jobs:
|
||||||
unityVersion: ${{ matrix.unityVersion }}
|
unityVersion: ${{ matrix.unityVersion }}
|
||||||
targetPlatform: ${{ matrix.targetPlatform }}
|
targetPlatform: ${{ matrix.targetPlatform }}
|
||||||
customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
|
customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
|
||||||
cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }}
|
providerStrategy: ${{ matrix.providerStrategy }}
|
||||||
|
|
||||||
###########################
|
###########################
|
||||||
# Upload #
|
# Upload #
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ jobs:
|
||||||
- 'cloud-runner-hooks'
|
- 'cloud-runner-hooks'
|
||||||
- 'cloud-runner-local-persistence'
|
- 'cloud-runner-local-persistence'
|
||||||
- 'cloud-runner-locking'
|
- 'cloud-runner-locking'
|
||||||
cloudRunnerCluster:
|
providerStrategy:
|
||||||
# - aws
|
# - aws
|
||||||
- local-docker
|
- local-docker
|
||||||
# - k8s
|
# - k8s
|
||||||
|
|
@ -65,14 +65,14 @@ jobs:
|
||||||
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
aws-region: eu-west-2
|
aws-region: eu-west-2
|
||||||
- uses: google-github-actions/auth@v1
|
- uses: google-github-actions/auth@v1
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
with:
|
with:
|
||||||
credentials_json: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
|
credentials_json: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
|
||||||
- name: 'Set up Cloud SDK'
|
- name: 'Set up Cloud SDK'
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
uses: 'google-github-actions/setup-gcloud@v1'
|
uses: 'google-github-actions/setup-gcloud@v1'
|
||||||
- name: Get GKE cluster credentials
|
- name: Get GKE cluster credentials
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
run: |
|
run: |
|
||||||
export USE_GKE_GCLOUD_AUTH_PLUGIN=True
|
export USE_GKE_GCLOUD_AUTH_PLUGIN=True
|
||||||
gcloud components install gke-gcloud-auth-plugin
|
gcloud components install gke-gcloud-auth-plugin
|
||||||
|
|
@ -86,7 +86,7 @@ jobs:
|
||||||
TARGET_PLATFORM: StandaloneWindows64
|
TARGET_PLATFORM: StandaloneWindows64
|
||||||
cloudRunnerTests: true
|
cloudRunnerTests: true
|
||||||
versioning: None
|
versioning: None
|
||||||
CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }}
|
CLOUD_RUNNER_CLUSTER: ${{ matrix.providerStrategy }}
|
||||||
tests:
|
tests:
|
||||||
needs: smokeTests
|
needs: smokeTests
|
||||||
name: Integration Tests
|
name: Integration Tests
|
||||||
|
|
@ -106,7 +106,7 @@ jobs:
|
||||||
- 'cloud-runner-s3-steps'
|
- 'cloud-runner-s3-steps'
|
||||||
#- 'cloud-runner-local-persistence'
|
#- 'cloud-runner-local-persistence'
|
||||||
# - 'cloud-runner-locking'
|
# - 'cloud-runner-locking'
|
||||||
cloudRunnerCluster:
|
providerStrategy:
|
||||||
- aws
|
- aws
|
||||||
- local-docker
|
- local-docker
|
||||||
- k8s
|
- k8s
|
||||||
|
|
@ -122,14 +122,14 @@ jobs:
|
||||||
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
aws-region: eu-west-2
|
aws-region: eu-west-2
|
||||||
- uses: google-github-actions/auth@v1
|
- uses: google-github-actions/auth@v1
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
with:
|
with:
|
||||||
credentials_json: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
|
credentials_json: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
|
||||||
- name: 'Set up Cloud SDK'
|
- name: 'Set up Cloud SDK'
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
uses: 'google-github-actions/setup-gcloud@v1'
|
uses: 'google-github-actions/setup-gcloud@v1'
|
||||||
- name: Get GKE cluster credentials
|
- name: Get GKE cluster credentials
|
||||||
if: matrix.CloudRunnerCluster == 'k8s'
|
if: matrix.providerStrategy == 'k8s'
|
||||||
run: |
|
run: |
|
||||||
export USE_GKE_GCLOUD_AUTH_PLUGIN=True
|
export USE_GKE_GCLOUD_AUTH_PLUGIN=True
|
||||||
gcloud components install gke-gcloud-auth-plugin
|
gcloud components install gke-gcloud-auth-plugin
|
||||||
|
|
@ -143,7 +143,7 @@ jobs:
|
||||||
TARGET_PLATFORM: StandaloneWindows64
|
TARGET_PLATFORM: StandaloneWindows64
|
||||||
cloudRunnerTests: true
|
cloudRunnerTests: true
|
||||||
versioning: None
|
versioning: None
|
||||||
PROVIDER_STRATEGY: ${{ matrix.cloudRunnerCluster }}
|
PROVIDER_STRATEGY: ${{ matrix.providerStrategy }}
|
||||||
buildTargetTests:
|
buildTargetTests:
|
||||||
needs: smokeTests
|
needs: smokeTests
|
||||||
name: Local Build Target Tests
|
name: Local Build Target Tests
|
||||||
|
|
@ -151,7 +151,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
cloudRunnerCluster:
|
providerStrategy:
|
||||||
#- aws
|
#- aws
|
||||||
- local-docker
|
- local-docker
|
||||||
#- k8s
|
#- k8s
|
||||||
|
|
@ -177,11 +177,11 @@ jobs:
|
||||||
cloudRunnerTests: true
|
cloudRunnerTests: true
|
||||||
versioning: None
|
versioning: None
|
||||||
targetPlatform: ${{ matrix.targetPlatform }}
|
targetPlatform: ${{ matrix.targetPlatform }}
|
||||||
cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }}
|
providerStrategy: ${{ matrix.providerStrategy }}
|
||||||
- run: |
|
- run: |
|
||||||
cp ./cloud-runner-cache/cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build/${{ steps.unity-build.outputs.BUILD_ARTIFACT }} ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
|
cp ./cloud-runner-cache/cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build/${{ steps.unity-build.outputs.BUILD_ARTIFACT }} ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: ${{ matrix.cloudRunnerCluster }} Build (${{ matrix.targetPlatform }})
|
name: ${{ matrix.providerStrategy }} Build (${{ matrix.targetPlatform }})
|
||||||
path: ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
|
path: ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
|
||||||
retention-days: 14
|
retention-days: 14
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ inputs:
|
||||||
default: 'game-ci'
|
default: 'game-ci'
|
||||||
required: false
|
required: false
|
||||||
description: '[CloudRunner] The Cloud Formation stack name that must be setup before using this option.'
|
description: '[CloudRunner] The Cloud Formation stack name that must be setup before using this option.'
|
||||||
cloudRunnerCluster:
|
providerStrategy:
|
||||||
default: 'local'
|
default: 'local'
|
||||||
required: false
|
required: false
|
||||||
description:
|
description:
|
||||||
|
|
|
||||||
|
|
@ -2965,7 +2965,7 @@ class LocalDockerCloudRunner {
|
||||||
const { workspace, actionFolder } = __1.Action;
|
const { workspace, actionFolder } = __1.Action;
|
||||||
const content = [];
|
const content = [];
|
||||||
for (const x of secrets) {
|
for (const x of secrets) {
|
||||||
content.push({ name: x.EnvironmentVariable, value: x.ParameterValue });
|
content.push({ name: x.ParameterKey, value: x.ParameterValue });
|
||||||
}
|
}
|
||||||
for (const x of environment) {
|
for (const x of environment) {
|
||||||
content.push({ name: x.name, value: x.value });
|
content.push({ name: x.name, value: x.value });
|
||||||
|
|
@ -6345,7 +6345,7 @@ class ImageEnvironmentFactory {
|
||||||
{ name: 'RUNNER_TEMP', value: process.env.RUNNER_TEMP },
|
{ name: 'RUNNER_TEMP', value: process.env.RUNNER_TEMP },
|
||||||
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
|
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
|
||||||
];
|
];
|
||||||
if (parameters.cloudRunnerCluster === 'local-docker') {
|
if (parameters.providerStrategy === 'local-docker') {
|
||||||
for (const element of additionalVariables) {
|
for (const element of additionalVariables) {
|
||||||
if (environmentVariables.find((x) => element !== undefined && element.name !== undefined && x.name === element.name) === undefined) {
|
if (environmentVariables.find((x) => element !== undefined && element.name !== undefined && x.name === element.name) === undefined) {
|
||||||
environmentVariables.push(element);
|
environmentVariables.push(element);
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
10
package.json
10
package.json
|
|
@ -12,17 +12,17 @@
|
||||||
"lint": "prettier --check \"src/**/*.{js,ts}\" && eslint src/**/*.ts",
|
"lint": "prettier --check \"src/**/*.{js,ts}\" && eslint src/**/*.ts",
|
||||||
"format": "prettier --write \"src/**/*.{js,ts}\"",
|
"format": "prettier --write \"src/**/*.{js,ts}\"",
|
||||||
"cli": "yarn ts-node src/index.ts -m cli",
|
"cli": "yarn ts-node src/index.ts -m cli",
|
||||||
"gcp-secrets-tests": "cross-env cloudRunnerCluster=aws cloudRunnerTests=true readInputOverrideCommand=\"gcp-secret-manager\" populateOverride=true readInputFromOverrideList=UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD yarn test -i -t \"cloud runner\"",
|
"gcp-secrets-tests": "cross-env providerStrategy=aws cloudRunnerTests=true readInputOverrideCommand=\"gcp-secret-manager\" populateOverride=true readInputFromOverrideList=UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD yarn test -i -t \"cloud runner\"",
|
||||||
"gcp-secrets-cli": "cross-env cloudRunnerTests=true readInputOverrideCommand=\"gcp-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --readInputFromOverrideList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
|
"gcp-secrets-cli": "cross-env cloudRunnerTests=true readInputOverrideCommand=\"gcp-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --readInputFromOverrideList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
|
||||||
"aws-secrets-cli": "cross-env cloudRunnerTests=true readInputOverrideCommand=\"aws-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --readInputFromOverrideList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
|
"aws-secrets-cli": "cross-env cloudRunnerTests=true readInputOverrideCommand=\"aws-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --readInputFromOverrideList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
|
||||||
"cli-aws": "cross-env cloudRunnerCluster=aws yarn run test-cli",
|
"cli-aws": "cross-env providerStrategy=aws yarn run test-cli",
|
||||||
"cli-k8s": "cross-env cloudRunnerCluster=k8s yarn run test-cli",
|
"cli-k8s": "cross-env providerStrategy=k8s yarn run test-cli",
|
||||||
"test-cli": "cross-env cloudRunnerTests=true yarn ts-node src/index.ts -m cli --projectPath test-project",
|
"test-cli": "cross-env cloudRunnerTests=true yarn ts-node src/index.ts -m cli --projectPath test-project",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"test-i": "cross-env cloudRunnerTests=true yarn test -i -t \"cloud runner\"",
|
"test-i": "cross-env cloudRunnerTests=true yarn test -i -t \"cloud runner\"",
|
||||||
"test-i-*": "yarn run test-i-aws && yarn run test-i-k8s",
|
"test-i-*": "yarn run test-i-aws && yarn run test-i-k8s",
|
||||||
"test-i-aws": "cross-env cloudRunnerTests=true cloudRunnerCluster=aws yarn test -i -t \"cloud runner\"",
|
"test-i-aws": "cross-env cloudRunnerTests=true providerStrategy=aws yarn test -i -t \"cloud runner\"",
|
||||||
"test-i-k8s": "cross-env cloudRunnerTests=true cloudRunnerCluster=k8s yarn test -i -t \"cloud runner\""
|
"test-i-k8s": "cross-env cloudRunnerTests=true providerStrategy=k8s yarn test -i -t \"cloud runner\""
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16.x"
|
"node": ">=16.x"
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
||||||
const { workspace, actionFolder } = Action;
|
const { workspace, actionFolder } = Action;
|
||||||
const content: any[] = [];
|
const content: any[] = [];
|
||||||
for (const x of secrets) {
|
for (const x of secrets) {
|
||||||
content.push({ name: x.EnvironmentVariable, value: x.ParameterValue });
|
content.push({ name: x.ParameterKey, value: x.ParameterValue });
|
||||||
}
|
}
|
||||||
for (const x of environment) {
|
for (const x of environment) {
|
||||||
content.push({ name: x.name, value: x.value });
|
content.push({ name: x.name, value: x.value });
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ class ImageEnvironmentFactory {
|
||||||
{ name: 'RUNNER_TEMP', value: process.env.RUNNER_TEMP },
|
{ name: 'RUNNER_TEMP', value: process.env.RUNNER_TEMP },
|
||||||
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
|
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
|
||||||
];
|
];
|
||||||
if (parameters.cloudRunnerCluster === 'local-docker') {
|
if (parameters.providerStrategy === 'local-docker') {
|
||||||
for (const element of additionalVariables) {
|
for (const element of additionalVariables) {
|
||||||
if (
|
if (
|
||||||
environmentVariables.find(
|
environmentVariables.find(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue