Skip to content

Commit

Permalink
add dlq-service during BB pipeline (#2617)
Browse files Browse the repository at this point in the history
reverse optional dep logic and only add dlq-service during BB pipeline\
  • Loading branch information
gxueatlassian authored Dec 14, 2023
1 parent 12865e4 commit d8caaf7
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 25 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn run lint
- run: yarn run build:release
Expand All @@ -35,10 +31,6 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn run playwright install
- name: create .env file
Expand Down Expand Up @@ -92,10 +84,6 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn spa:build
- name: create .env file
Expand Down Expand Up @@ -150,10 +138,6 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- name: Build Docker image
uses: docker/[email protected]
with:
Expand Down
2 changes: 0 additions & 2 deletions .yarnrc

This file was deleted.

1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ COPY . /app
WORKDIR /app

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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY . /app
WORKDIR /app

# Installing packages
RUN rm .yarnrc
RUN yarn add @atlassian/sqs-queue-dlq-service
RUN yarn install --frozen-lockfile
RUN yarn list

Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@
"ts-node-dev": "^2.0.0",
"yaml-lint": "^1.2.4"
},
"optionalDependencies": {
"@atlassian/sqs-queue-dlq-service": "^2.1.1"
},
"volta": {
"node": "18.18.1",
"yarn": "1.22.18"
Expand Down
3 changes: 1 addition & 2 deletions spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,5 @@
"react-scripts": "^5.0.1",
"ts-jest": "^29.1.1",
"typescript": "^5.0.2"
},
"optionalDependencies": {}
}
}

0 comments on commit d8caaf7

Please sign in to comment.