Skip to content

Commit d8caaf7

Browse files
add dlq-service during BB pipeline (#2617)
reverse optional dep logic and only add dlq-service during BB pipeline\
1 parent 12865e4 commit d8caaf7

File tree

6 files changed

+2
-25
lines changed

6 files changed

+2
-25
lines changed

.github/workflows/on-push.yml

-16
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ jobs:
1818
with:
1919
path: '**/node_modules'
2020
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
21-
- name: remove internal package
22-
run: |
23-
sed -i '/sqs-queue-dlq-service/d' ./package.json
24-
cat ./package.json
2521
- run: yarn install --frozen-lockfile
2622
- run: yarn run lint
2723
- run: yarn run build:release
@@ -35,10 +31,6 @@ jobs:
3531
with:
3632
path: '**/node_modules'
3733
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
38-
- name: remove internal package
39-
run: |
40-
sed -i '/sqs-queue-dlq-service/d' ./package.json
41-
cat ./package.json
4234
- run: yarn install --frozen-lockfile
4335
- run: yarn run playwright install
4436
- name: create .env file
@@ -92,10 +84,6 @@ jobs:
9284
with:
9385
path: '**/node_modules'
9486
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
95-
- name: remove internal package
96-
run: |
97-
sed -i '/sqs-queue-dlq-service/d' ./package.json
98-
cat ./package.json
9987
- run: yarn install --frozen-lockfile
10088
- run: yarn spa:build
10189
- name: create .env file
@@ -150,10 +138,6 @@ jobs:
150138
runs-on: ubuntu-22.04
151139
steps:
152140
- uses: actions/checkout@v1
153-
- name: remove internal package
154-
run: |
155-
sed -i '/sqs-queue-dlq-service/d' ./package.json
156-
cat ./package.json
157141
- name: Build Docker image
158142
uses: docker/[email protected]
159143
with:

.yarnrc

-2
This file was deleted.

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ COPY . /app
1414
WORKDIR /app
1515

1616
# Installing packages
17-
RUN sed -i '/sqs-queue-dlq-service/d' ./package.json
1817
RUN cat ./package.json
1918
RUN yarn install --frozen-lockfile
2019

Dockerfile.prod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY . /app
1818
WORKDIR /app
1919

2020
# Installing packages
21-
RUN rm .yarnrc
21+
RUN yarn add @atlassian/sqs-queue-dlq-service
2222
RUN yarn install --frozen-lockfile
2323
RUN yarn list
2424

package.json

-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@
182182
"ts-node-dev": "^2.0.0",
183183
"yaml-lint": "^1.2.4"
184184
},
185-
"optionalDependencies": {
186-
"@atlassian/sqs-queue-dlq-service": "^2.1.1"
187-
},
188185
"volta": {
189186
"node": "18.18.1",
190187
"yarn": "1.22.18"

spa/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,5 @@
7171
"react-scripts": "^5.0.1",
7272
"ts-jest": "^29.1.1",
7373
"typescript": "^5.0.2"
74-
},
75-
"optionalDependencies": {}
74+
}
7675
}

0 commit comments

Comments
 (0)