Skip to content

Commit

Permalink
Set up CI for development branch; deprecate stable branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Pwuts committed Oct 21, 2023
1 parent eda21d5 commit 16e266c
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/autogpt-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: AutoGPT Python CI

on:
push:
branches: [ master, ci-test* ]
branches: [ master, development, ci-test* ]
paths:
- 'autogpts/autogpt/**'
- '!autogpts/autogpt/tests/vcr_cassettes'
pull_request:
branches: [ stable, master, release-* ]
branches: [ master, development, release-* ]
paths:
- 'autogpts/autogpt/**'
- '!autogpts/autogpt/tests/vcr_cassettes'
pull_request_target:
branches: [ master, release-*, ci-test* ]
branches: [ master, development, release-*, ci-test* ]
paths:
- 'autogpts/autogpt/**'
- '!autogpts/autogpt/tests/vcr_cassettes'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/autogpt-docker-cache-clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: 20 4 * * 1,4

env:
BASE_BRANCH: master
BASE_BRANCH: development
IMAGE_NAME: auto-gpt

jobs:
Expand Down Expand Up @@ -38,10 +38,10 @@ jobs:

build_type: ${{ matrix.build-type }}

prod_branch: stable
dev_branch: master
prod_branch: master
dev_branch: development
repository: ${{ github.repository }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }}

current_ref: ${{ github.ref_name }}
commit_hash: ${{ github.sha }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/autogpt-docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: AutoGPT Docker CI

on:
push:
branches: [ master ]
branches: [ master, development ]
paths:
- 'autogpts/autogpt/**'
- '!autogpts/autogpt/tests/vcr_cassettes'
pull_request:
branches: [ master, release-*, stable ]
branches: [ master, development, release-* ]
paths:
- 'autogpts/autogpt/**'
- '!autogpts/autogpt/tests/vcr_cassettes'
Expand Down Expand Up @@ -61,10 +61,10 @@ jobs:

build_type: ${{ matrix.build-type }}

prod_branch: stable
dev_branch: master
prod_branch: master
dev_branch: development
repository: ${{ github.repository }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }}

current_ref: ${{ github.ref_name }}
commit_hash: ${{ github.event.after }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/autogpt-docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
event_ref_type: ${{ github.event.ref}}
inputs_no_cache: ${{ inputs.no_cache }}

prod_branch: stable
dev_branch: master
prod_branch: master
dev_branch: development
repository: ${{ github.repository }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }}
base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }}

ref_type: ${{ github.ref_type }}
current_ref: ${{ github.ref_name }}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/autogpts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ name: Valid AutoGPTs

on:
workflow_dispatch:
branches: [master]
schedule:
- cron: '0 8 * * *'
push:
branches: [master, ci-test*]
branches: [ master, development, ci-test* ]
pull_request:
branches: [stable, master, release-*]
branches: [ master, development, release-* ]

jobs:
run-tests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/benchmark-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Benchmark CI

on:
push:
branches: [master, ci-test*]
branches: [ master, development, ci-test* ]
paths:
- 'benchmark/**'
- .github/workflows/benchmark-ci.yml
- '!benchmark/reports/**'
pull_request:
branches: [stable, master, release-*]
branches: [ master, development, release-* ]
paths:
- 'benchmark/**'
- '!benchmark/reports/**'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- development
- 'ci-test*' # This will match any branch that starts with "ci-test"
paths:
- 'frontend/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Pull Request auto-label"
on:
# So that PRs touching the same files as the push are updated
push:
branches: [ master, release-* ]
branches: [ master, development, release-* ]
paths-ignore:
- 'autogpts/autogpt/tests/vcr_cassettes'
- 'benchmark/reports/**'
Expand Down
2 changes: 1 addition & 1 deletion autogpts/autogpt/autogpt/app/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def print_motd(config: Config, logger: logging.Logger):

def print_git_branch_info(logger: logging.Logger):
git_branch = get_current_git_branch()
if git_branch and git_branch != "stable":
if git_branch and git_branch != "master":
logger.warn(
f"You are running on `{git_branch}` branch"
" - this is not a supported branch."
Expand Down
10 changes: 5 additions & 5 deletions autogpts/autogpt/autogpt/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ There are two client applications for AutoGPT included.

The first app is a straight CLI application. I have not done anything yet to port all the friendly display stuff from the ~~`logger.typewriter_log`~~`user_friendly_output` logic.

- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_app/cli.py)
- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_app/main.py)
- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_app/cli.py)
- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_app/main.py)

You'll then need a settings file. Run

Expand Down Expand Up @@ -71,9 +71,9 @@ The second app is still a CLI, but it sets up a local webserver that the client
rather than invoking calls to the Agent library code directly. This application is essentially a sketch
at this point as the folks who were driving it have had less time (and likely not enough clarity) to proceed.

- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/cli.py)
- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/client/client.py)
- [Server API](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/server/api.py)
- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/cli.py)
- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/client/client.py)
- [Server API](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/server/api.py)

To run, you still need to generate a default configuration. You can do

Expand Down
2 changes: 1 addition & 1 deletion docs/content/challenges/building_challenges.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Output => Artifact (files, image, code, etc, etc...)

## Defining your Agent

Go to https://github.com/Significant-Gravitas/AutoGPT/blob/master/tests/integration/agent_factory.py
Go to https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/tests/integration/agent_factory.py

Create your agent fixture.

Expand Down
6 changes: 3 additions & 3 deletions docs/content/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Get your OpenAI API key from: [https://platform.openai.com/account/api-keys](htt
1. Clone the repository

```shell
git clone -b stable https://github.com/Significant-Gravitas/AutoGPT.git
git clone https://github.com/Significant-Gravitas/AutoGPT.git
```

2. Navigate to the directory where you downloaded the repository
Expand All @@ -110,7 +110,7 @@ Get your OpenAI API key from: [https://platform.openai.com/account/api-keys](htt
!!! warning
We recommend to use Git or Docker, to make updating easier. Also note that some features such as Python execution will only work inside docker for security reasons.

1. Download `Source code (zip)` from the [latest stable release](https://github.com/Significant-Gravitas/AutoGPT/releases/latest)
1. Download `Source code (zip)` from the [latest release](https://github.com/Significant-Gravitas/AutoGPT/releases/latest)
2. Extract the zip-file into a folder


Expand Down Expand Up @@ -211,7 +211,7 @@ docker run -it --env-file=.env -v $PWD:/app auto-gpt
docker run -it --env-file=.env -v $PWD:/app --rm auto-gpt --gpt3only --continuous
```

[Docker Compose file]: https://github.com/Significant-Gravitas/AutoGPT/blob/stable/docker-compose.yml
[Docker Compose file]: https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/docker-compose.yml


### Run with Dev Container
Expand Down

0 comments on commit 16e266c

Please sign in to comment.