ci: fix source names

bifravst · Jul 17, 2019 · 6e3360c · 6e3360c
1 parent 048d732
commit 6e3360c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/cdk/BifravstContinuousDeploymentStack.ts b/cdk/BifravstContinuousDeploymentStack.ts
@@ -151,7 +151,7 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  },
  outputArtifacts: [
  {
- name: 'SourceOutput',
+ name: 'BifravstAWS',
  },
  ],
  configuration: {
@@ -160,7 +160,6 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  Repo: repo,
  OAuthToken: githubToken.stringValue,
  },
- runOrder: 1,
  },
  ],
  },
@@ -169,7 +168,7 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  actions: [
  {
  name: 'DeployAction',
- inputArtifacts: [{ name: 'SourceOutput' }],
+ inputArtifacts: [{ name: 'BifravstAWS' }],
  actionTypeId: {
  category: 'Build',
  owner: 'AWS',
@@ -179,7 +178,6 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  configuration: {
  ProjectName: project.name,
  },
- runOrder: 1,
  outputArtifacts: [
  {
  name: 'BuildId',
@@ -233,7 +231,7 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  },
  outputArtifacts: [
  {
- name: 'SourceOutput',
+ name: 'BifravstAWS',
  },
  ],
  configuration: {
@@ -242,7 +240,6 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  Repo: repo,
  OAuthToken: githubToken.stringValue,
  },
- runOrder: 1,
  },
  {
  name: 'AppSourceAction',
@@ -254,7 +251,7 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  },
  outputArtifacts: [
  {
- name: 'AppSourceOutput',
+ name: 'BifravstApp',
  },
  ],
  configuration: {
@@ -263,7 +260,6 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  Repo: app.repo,
  OAuthToken: githubToken.stringValue,
  },
- runOrder: 2,
  },
  ],
  },
@@ -273,8 +269,8 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  {
  name: 'DeployAction',
  inputArtifacts: [
- { name: 'SourceOutput' },
- { name: 'AppSourceOutput' },
+ { name: 'BifravstAWS' },
+ { name: 'BifravstApp' },
  ],
  actionTypeId: {
  category: 'Build',
@@ -284,8 +280,8 @@ export class BifravstContinuousDeploymentStack extends CloudFormation.Stack {
  },
  configuration: {
  ProjectName: appProject.name,
+ PrimarySource: 'BifravstAWS',
  },
- runOrder: 1,
  outputArtifacts: [
  {
  name: 'BuildId',

diff --git a/continuous-deployment-app.yml b/continuous-deployment-app.yml
@@ -9,8 +9,8 @@ phases:
  - npx tsc
  build:
  commands:
- - node dist/scripts/print-react-app-configuration.js > $CODEBUILD_SRC_DIR_AppSourceOutput/.env.production.local
- - cat $CODEBUILD_SRC_DIR_AppSourceOutput/.env.production.local
- - export $(cat $CODEBUILD_SRC_DIR_AppSourceOutput/.env.production.local | xargs)
- - cd $CODEBUILD_SRC_DIR_AppSourceOutput/; npm ci --no-audit; npm run build;
- - aws s3 cp $CODEBUILD_SRC_DIR_AppSourceOutput/build s3://$REACT_APP_WEBSITE_BUCKET --recursive --metadata-directive REPLACE --cache-control 'public,max-age=600' --expires ''
+ - node dist/scripts/print-react-app-configuration.js > $CODEBUILD_SRC_DIR_BifravstApp/.env.production.local
+ - cat $CODEBUILD_SRC_DIR_BifravstApp/.env.production.local
+ - export $(cat $CODEBUILD_SRC_DIR_BifravstApp/.env.production.local | xargs)
+ - cd $CODEBUILD_SRC_DIR_BifravstApp/; npm ci --no-audit; npm run build;
+ - aws s3 cp $CODEBUILD_SRC_DIR_BifravstApp/build s3://$REACT_APP_WEBSITE_BUCKET --recursive --metadata-directive REPLACE --cache-control 'public,max-age=600' --expires ''