Skip to content
This repository was archived by the owner on Aug 6, 2025. It is now read-only.

Commit 4717070

Browse files
schmallisoschmalliso
committed
DO IT LIIIIIVE
1 parent c80c755 commit 4717070

File tree

2 files changed

+63
-63
lines changed

2 files changed

+63
-63
lines changed

‎.github/workflows/deploy-stg-ecs.yml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -26,60 +26,60 @@ jobs:
2626
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
2727
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2828
aws-region: us-east-2
29-
- name: login-ecr
30-
id: login-ecr
31-
uses: aws-actions/amazon-ecr-login@v1
32-
- name: Create ECS Repo
33-
run: |
34-
cd infrastructure/ecs-repo
35-
npm ci
36-
sls deploy --stage stg
37-
sls deploy --stage dotcomstg
38-
sls deploy --stage legacydotcomstg
39-
- uses: mr-smithers-excellent/docker-build-push@v5
40-
name: build and push to ECR
41-
with:
42-
image: docs-worker-pool-stg
43-
tags: latest
44-
registry: ${{ steps.login-ecr.outputs.registry }}
45-
buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
46-
env:
47-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
48-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
49-
NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
50-
NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
51-
- uses: mr-smithers-excellent/docker-build-push@v5
52-
name: build and push to ECR DOTCOM
53-
with:
54-
image: docs-worker-pool-dotcomstg
55-
tags: latest
56-
registry: ${{ steps.login-ecr.outputs.registry }}
57-
buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
58-
env:
59-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
60-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
61-
NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
62-
NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
63-
- uses: mr-smithers-excellent/docker-build-push@v5
64-
name: build and push to ECR Legacy DOTCOM
65-
with:
66-
image: docs-worker-pool-legacydotcomstg
67-
tags: latest
68-
registry: ${{ steps.login-ecr.outputs.registry }}
69-
dockerfile: Dockerfile.legacy
70-
buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
71-
env:
72-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
73-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
74-
NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
75-
NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
76-
- name: Deploy ECS
77-
run: |
78-
cd infrastructure/ecs-main
79-
npm ci
80-
sls deploy --stage stg
81-
sls deploy --stage dotcomstg
82-
sls deploy --stage legacydotcomstg
29+
# - name: login-ecr
30+
# id: login-ecr
31+
# uses: aws-actions/amazon-ecr-login@v1
32+
# - name: Create ECS Repo
33+
# run: |
34+
# cd infrastructure/ecs-repo
35+
# npm ci
36+
# sls deploy --stage stg
37+
# sls deploy --stage dotcomstg
38+
# sls deploy --stage legacydotcomstg
39+
# - uses: mr-smithers-excellent/docker-build-push@v5
40+
# name: build and push to ECR
41+
# with:
42+
# image: docs-worker-pool-stg
43+
# tags: latest
44+
# registry: ${{ steps.login-ecr.outputs.registry }}
45+
# buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
46+
# env:
47+
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
48+
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
49+
# NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
50+
# NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
51+
# - uses: mr-smithers-excellent/docker-build-push@v5
52+
# name: build and push to ECR DOTCOM
53+
# with:
54+
# image: docs-worker-pool-dotcomstg
55+
# tags: latest
56+
# registry: ${{ steps.login-ecr.outputs.registry }}
57+
# buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
58+
# env:
59+
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
60+
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
61+
# NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
62+
# NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
63+
# - uses: mr-smithers-excellent/docker-build-push@v5
64+
# name: build and push to ECR Legacy DOTCOM
65+
# with:
66+
# image: docs-worker-pool-legacydotcomstg
67+
# tags: latest
68+
# registry: ${{ steps.login-ecr.outputs.registry }}
69+
# dockerfile: Dockerfile.legacy
70+
# buildArgs: NPM_EMAIL=${{ secrets.NPM_EMAIL }},NPM_BASE_64_AUTH=${{ secrets.NPM_BASE64_AUTH }}
71+
# env:
72+
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
73+
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
74+
# NPM_BASE_64_AUTH: ${{ secrets.NPM_BASE64_AUTH }}
75+
# NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
76+
# - name: Deploy ECS
77+
# run: |
78+
# cd infrastructure/ecs-main
79+
# npm ci
80+
# sls deploy --stage stg
81+
# sls deploy --stage dotcomstg
82+
# sls deploy --stage legacydotcomstg
8383
- name: Deploy Lambdas
8484
run: |
8585
npm ci

‎api/controllers/v1/jobs.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ async function prepSummaryMessage(
241241
failed = false
242242
): Promise<string> {
243243
const urls = extractUrlFromMessage(fullDocument);
244-
let mms_urls = [null, null];
244+
let mms_urls = ['', ''];
245245
// mms-docs needs special handling as it builds two sites (cloudmanager & ops manager)
246246
// so we need to extract both URLs
247247
if (repoName === 'mms-docs') {
@@ -305,10 +305,10 @@ async function NotifyBuildProgress(jobId: string): Promise<any> {
305305
const jobRepository = new JobRepository(db, c, consoleLogger);
306306
// TODO: Make fullDocument be of type Job, validate existence
307307
const fullDocument = await jobRepository.getJobById(jobId);
308-
// if (!fullDocument) {
309-
// consoleLogger.error('Cannot find job in db.', '');
310-
// return;
311-
// }
308+
if (!fullDocument) {
309+
consoleLogger.error('Cannot find job in db.', '');
310+
return;
311+
}
312312
const jobTitle = fullDocument.title;
313313
const username = fullDocument.user;
314314
const repoEntitlementRepository = new RepoEntitlementsRepository(db, c, consoleLogger);
@@ -360,10 +360,10 @@ async function SubmitArchiveJob(jobId: string) {
360360
branches: new BranchRepository(db, c, consoleLogger),
361361
};
362362
const job = await models.jobs.getJobById(jobId);
363-
// if (!job) {
364-
// consoleLogger.error('Cannot find job in db', JSON.stringify({ jobId }));
365-
// return;
366-
// }
363+
if (!job) {
364+
consoleLogger.error('Cannot find job in db', JSON.stringify({ jobId }));
365+
return;
366+
}
367367
const repo = await models.branches.getRepo(job.payload.repoName);
368368

369369
/* NOTE

0 commit comments

Comments
 (0)