Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add dlq-service during BB pipeline #2617

Merged
merged 3 commits into from
Dec 14, 2023
Merged

add dlq-service during BB pipeline #2617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e460d6
add dlq-service during BB pipeline
gxueatlassian Dec 14, 2023
1ce76a6
reverse optional dep logic
gxueatlassian Dec 14, 2023
463e44f
reverse optional dep logic
gxueatlassian Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/workflows/on-push.yml
View file
Open in desktop
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
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No point of having this file now.

This file was deleted.

1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor Author

@gxueatlassian gxueatlassian Dec 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only drawback is we are not frozen this dep to a specific version, but I guess that's okay, since it is only used as our queue replay api, if failed, won't affect customer (in a disaster way)

RUN yarn install --frozen-lockfile
RUN yarn list

Expand Down
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
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
View file
Open in desktop
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": {}
}
}
Loading