Skip to content

Commit

Permalink
Merge branch '0.2' into arjun-g-dev-tool-config
Browse files Browse the repository at this point in the history
  • Loading branch information
luxzoli authored Oct 9, 2024
2 parents 99fb7f7 + bf3414c commit 17820e1
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 121 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ name: Build

on:
push:
branches: ["main"]
branches: ["0.2"]
pull_request:
branches: ["main"]
merge_group:
types: [checks_requested]
branches: ["0.2"]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' }}
permissions: {}
jobs:
paths-filter:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contrib-openai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: OpenAI4ContribTests

on:
pull_request:
branches: ["main"]
branches: ["0.2"]
paths:
- "autogen/**"
- "test/agentchat/contrib/**"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contrib-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: ContribTests

on:
pull_request:
branches: ["main"]
branches: ["0.2"]
paths:
- "autogen/**"
- "test/agentchat/contrib/**"
Expand All @@ -16,7 +16,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' }}
permissions:
{}
# actions: read
Expand Down
64 changes: 4 additions & 60 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ name: docs

on:
pull_request:
branches: [main]
path:
branches: ["0.2"]
paths:
- "autogen/*"
- "website/*"
- ".github/workflows/deploy-website.yml"
push:
branches: [main]
path:
branches: ["0.2"]
paths:
- "autogen/*"
- "website/*"
- ".github/workflows/deploy-website.yml"
workflow_dispatch:
merge_group:
types: [checks_requested]
permissions:
id-token: write
pages: write
Expand Down Expand Up @@ -67,57 +65,3 @@ jobs:
npm i --legacy-peer-deps
npm run build
fi
gh-release:
if: github.event_name != 'pull_request'
runs-on: ubuntu-latest
defaults:
run:
working-directory: website
steps:
- uses: actions/checkout@v4
with:
lfs: true
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: setup python
uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: pydoc-markdown install
run: |
python -m pip install --upgrade pip
pip install pydoc-markdown pyyaml termcolor
# Pin databind packages as version 4.5.0 is not compatible with pydoc-markdown.
pip install databind.core==4.4.2 databind.json==4.4.2
- name: pydoc-markdown run
run: |
pydoc-markdown
- name: quarto install
working-directory: ${{ runner.temp }}
run: |
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.tar.gz
tar -xzf quarto-1.5.23-linux-amd64.tar.gz
echo "$(pwd)/quarto-1.5.23/bin/" >> $GITHUB_PATH
- name: Process notebooks
run: |
python process_notebooks.py render
- name: Build website
run: |
if [ -e yarn.lock ]; then
yarn install --frozen-lockfile --ignore-engines
yarn build
elif [ -e package-lock.json ]; then
npm ci
npm run build
else
npm i --legacy-peer-deps
npm run build
fi
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "website/build"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
12 changes: 5 additions & 7 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ name: dotnet-ci
on:
workflow_dispatch:
pull_request:
branches: [ "main" ]
branches: [ "0.2" ]
push:
branches: [ "main" ]
merge_group:
types: [checks_requested]
branches: [ "0.2" ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' || github.ref != 'refs/heads/dotnet' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' || github.ref != 'refs/heads/dotnet' }}

permissions:
contents: read
Expand Down Expand Up @@ -122,7 +120,7 @@ jobs:
defaults:
run:
working-directory: dotnet
if: success() && (github.ref == 'refs/heads/main')
if: success() && (github.ref == 'refs/heads/0.2')
needs: aot-test
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -228,4 +226,4 @@ jobs:
env:
MYGET_TOKEN: ${{ secrets.MYGET_TOKEN }}
continue-on-error: true

5 changes: 3 additions & 2 deletions .github/workflows/lfs-check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Git LFS Check"

on: pull_request
on:
pull_request:
branches: ["0.2"]
permissions: {}
jobs:
lfs-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: OpenAI

on:
pull_request:
branches: ["main"]
branches: ["0.2"]
paths:
- "autogen/**"
- "test/**"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Code formatting
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on pull request or merge
pull_request:
merge_group:
types: [checks_requested]
branches: ["0.2"]

defaults:
run:
Expand Down
30 changes: 3 additions & 27 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@
name: python-package

on:
release:
types: [published]
workflow_dispatch:
push:
tags:
- "0.2.*"
permissions: {}
# actions: read
# checks: read
# contents: read
# deployments: read
jobs:
deploy:
strategy:
Expand All @@ -28,26 +24,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
# - name: Cache conda
# uses: actions/cache@v4
# with:
# path: ~/conda_pkgs_dir
# key: conda-${{ matrix.os }}-python-${{ matrix.python-version }}-${{ hashFiles('environment.yml') }}
# - name: Setup Miniconda
# uses: conda-incubator/setup-miniconda@v2
# with:
# auto-update-conda: true
# auto-activate-base: false
# activate-environment: hcrystalball
# python-version: ${{ matrix.python-version }}
# use-only-tar-bz2: true
- name: Install from source
# This is required for the pre-commit tests
shell: pwsh
run: pip install .
# - name: Conda list
# shell: pwsh
# run: conda list
- name: Build
shell: pwsh
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/samples-tools-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: SamplesToolsTests

on:
pull_request:
branches: ["main"]
branches: ["0.2"]
paths:
- "autogen/**"
- "samples/tools/**"
Expand All @@ -14,7 +14,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' }}
permissions: {}
jobs:
SamplesToolsFineTuningTests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Type check
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on pull request or merge
pull_request:
merge_group:
types: [checks_requested]
branches: ["0.2"]

defaults:
run:
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion website/docs/tutorial/conversation-patterns.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
"If we were to use the `round_robin` strategy, this list would specify the order\n",
"of the agents to be selected.\n",
"We also initialize the group chat with an empty message list and a maximum\n",
"round of 6, which means there will be at most 6 iteratiosn of selecting speaker,\n",
"round of 6, which means there will be at most 6 iterations of selecting a speaker,\n",
"agent speaks and broadcasting message."
]
},
Expand Down
18 changes: 9 additions & 9 deletions website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
title: "AutoGen",
tagline: "An Open-Source Programming Framework for Agentic AI",
url: "https://microsoft.github.io",
baseUrl: "/autogen/",
baseUrl: "/autogen/0.2/",
onBrokenLinks: "throw",
onBrokenMarkdownLinks: "warn",
favicon: "img/ag.ico",
Expand Down Expand Up @@ -184,14 +184,14 @@ module.exports = {
],
copyright: `Copyright © ${new Date().getFullYear()} AutoGen Authors | <a target="_blank" style="color:#10adff" href="https://go.microsoft.com/fwlink/?LinkId=521839">Privacy and Cookies</a> | <a target="_blank" style="color:#10adff" href="https://go.microsoft.com/fwlink/?linkid=2259814">Consumer Health Privacy</a>`,
},
// announcementBar: {
// id: "whats_new",
// content:
// 'What\'s new in AutoGen? Read <a href="/autogen/blog/2024/03/03/AutoGen-Update">this blog</a> for an overview of updates',
// backgroundColor: "#fafbfc",
// textColor: "#091E42",
// isCloseable: true,
// },
announcementBar: {
id: "newdocs",
content:
'Go <a href="/autogen/dev">here</a> to view the documentation for the work in progress version of AutoGen 0.4.',
backgroundColor: "#fafbfc",
textColor: "#091E42",
isCloseable: true,
},
/* Clarity Config */
clarity: {
ID: "lnxpe6skj1", // The Tracking ID provided by Clarity
Expand Down

0 comments on commit 17820e1

Please sign in to comment.