Skip to content

Commit c9aa470

Browse files
authored
Change docker and workflows (#241)
* Change docker and workflows * Fix duplicate objective entries for format
1 parent 32935f9 commit c9aa470

File tree

5 files changed

+9
-67
lines changed

5 files changed

+9
-67
lines changed

.github/workflows/code_style_check.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,8 @@ jobs:
1717
with:
1818
python-version: 3.8
1919

20-
- name: Set up Node.js
21-
uses: actions/setup-node@v2
22-
with:
23-
node-version: 14
24-
2520
- name: Install Python dependencies
2621
run: pip install black nbqa
2722

28-
- name: Install JavaScript dependencies
29-
run: |
30-
cd frontend
31-
npm install
32-
npm install -g eslint eslint-config-next @babel/core @babel/eslint-parser
33-
3423
- name: Run Black on Python files
3524
run: black --check $(find . -type f -name "*.py")
36-
37-
- name: Run ESLint on JavaScript files
38-
run: |
39-
cd frontend
40-
npx eslint .

.github/workflows/docker-image.yml

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ name: Docker Build
22

33
on:
44
schedule:
5-
- cron: '42 7 * * *'
5+
- cron: "42 7 * * *"
66
push:
7-
branches: [ "main" ]
8-
tags: [ 'v*.*.*' ]
7+
branches: ["main"]
8+
tags: ["v*.*.*"]
99
pull_request:
10-
branches: [ "main" ]
10+
branches: ["main"]
1111

1212
env:
1313
REGISTRY: ghcr.io
1414
IMAGE_NAME: ${{ github.repository }}
1515

1616
jobs:
17-
build-backend:
17+
build:
1818
runs-on: ubuntu-latest
1919
permissions:
2020
contents: read
@@ -29,7 +29,7 @@ jobs:
2929
if: github.event_name != 'pull_request'
3030
uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6
3131
with:
32-
cosign-release: 'v1.11.0'
32+
cosign-release: "v1.11.0"
3333

3434
- name: Setup Docker buildx
3535
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
@@ -46,56 +46,16 @@ jobs:
4646
id: meta
4747
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
4848
with:
49-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend
49+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5050

5151
- name: Build and push Docker image
5252
id: build-and-push
5353
uses: docker/build-push-action@v4
5454
with:
5555
context: .
56-
file: ./Dockerfile-backend
56+
file: ./Dockerfile
5757
push: ${{ github.event_name != 'pull_request' }}
5858
tags: ${{ steps.meta.outputs.tags }}
5959
labels: ${{ steps.meta.outputs.labels }}
6060
cache-from: type=gha
6161
cache-to: type=gha,mode=max
62-
63-
build-frontend:
64-
runs-on: ubuntu-latest
65-
permissions:
66-
contents: read
67-
packages: write
68-
id-token: write
69-
70-
steps:
71-
- name: Checkout repository
72-
uses: actions/checkout@v3
73-
74-
- name: Setup Docker buildx
75-
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
76-
77-
- name: Log into registry ${{ env.REGISTRY }}
78-
if: github.event_name != 'pull_request'
79-
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
80-
with:
81-
registry: ${{ env.REGISTRY }}
82-
username: ${{ github.actor }}
83-
password: ${{ secrets.GITHUB_TOKEN }}
84-
85-
- name: Extract Docker metadata for frontend
86-
id: meta-frontend
87-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
88-
with:
89-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend
90-
91-
- name: Build and push frontend Docker image
92-
id: build-and-push-frontend
93-
uses: docker/build-push-action@v4
94-
with:
95-
context: ./frontend
96-
file: ./frontend/Dockerfile
97-
push: ${{ github.event_name != 'pull_request' }}
98-
tags: ${{ steps.meta-frontend.outputs.tags }}
99-
labels: ${{ steps.meta-frontend.outputs.labels }}
100-
cache-from: type=gha
101-
cache-to: type=gha,mode=max

AgentLLM.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ def task_creation_agent(
255255
task=self.primary_objective,
256256
commands_enabled=False,
257257
prompt="task",
258-
objective=self.primary_objective,
259258
result=result,
260259
task_description=task_description,
261260
tasks=", ".join(task_list),
@@ -277,7 +276,6 @@ def prioritization_agent(self):
277276
task=self.primary_objective,
278277
commands_enabled=False,
279278
prompt="priority",
280-
objective=self.primary_objective,
281279
tasks=", ".join(task_names),
282280
next_task_id=next_task_id,
283281
)
File renamed without changes.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
backend:
1616
build:
1717
context: .
18-
dockerfile: Dockerfile-backend
18+
dockerfile: Dockerfile
1919
init: true
2020
env_file:
2121
- .env

0 commit comments

Comments
 (0)