Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into jenkins/zshkoor/readthedocs-8b4b8a1
Browse files Browse the repository at this point in the history
  • Loading branch information
iamsobanjaved authored Oct 9, 2023
2 parents 5e5326d + 5809f37 commit aeefa72
Show file tree
Hide file tree
Showing 50 changed files with 528 additions and 668 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Add new issues to appropriate GitHub Projects

on:
issues:
types:
- opened

jobs:
add_to_arch_bom_board:
uses: openedx/.github/.github/workflows/add-issue-to-a-project.yml@master
secrets:
GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
with:
ORGANIZATION: edx
PROJECT_NUMBER: 11
8 changes: 5 additions & 3 deletions .github/workflows/cli-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
Expand All @@ -48,15 +48,17 @@ jobs:
sudo apt update
sudo apt install docker-ce containerd.io
docker version
docker-compose --version
docker compose --version
# Note: we cannot use Docker Desktop because it has not been licensed for use in GithubActions
- name: Docker installation - Mac
if: ${{ matrix.os.name == 'mac' }}
run: |
brew install lima docker
brew install lima docker docker-compose
limactl start --name=default template://docker
echo "DOCKER_HOST=unix:///Users/runner/.lima/default/sock/docker.sock" >> $GITHUB_ENV
mkdir -p ~/.docker/cli-plugins
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
- name: Install Python dependencies
run: make requirements
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/follow-up-devstack-bugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
issues: write
steps:
- name: Add comment
uses: peter-evans/create-or-update-comment@411d7f9b4092af4736447c5420752e3b2be55ec1
uses: peter-evans/create-or-update-comment@46da6c0d98504aed6fc429519a258b951f23f474
with:
issue-number: ${{ github.event.issue.number }}
body: |
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/pr-automerge-open-release.yml

This file was deleted.

27 changes: 18 additions & 9 deletions .github/workflows/provisioning-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ name: Provisioning tests
on:
push:
branches: [master]
paths-ignore:
- '**.rst'
pull_request:
branches:
- '**'
paths-ignore:
- '**.rst'
schedule:
# run at 7:30 am M-F
- cron: '30 11 * * 1-5'
Expand All @@ -26,11 +28,11 @@ jobs:
os:
- ubuntu-20.04 # Ubuntu 20.04 "Focal Fossa"
python-version: [ '3.8' ]
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue]
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms]
fail-fast: false # some services can be flaky; let others run to completion even if one fails

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
Expand All @@ -46,10 +48,13 @@ jobs:
sudo apt update
sudo apt install docker-ce containerd.io
docker version
docker-compose --version
docker compose --version
- name: free up disk space
run: sudo apt remove --purge -y ghc-* azure-cli google-cloud-sdk hhvm llvm-* dotnet-* powershell mono-* php* ruby*
# 2023-09-28: google-cloud-sdk removed from this list because it was intermittently
# unavailable as an apt package to remove, and might be migrating to snap. If more
# disk space is needed, see if the snap is installed, and remove that.
run: sudo apt remove --purge -y ghc-* azure-cli hhvm llvm-* dotnet-* powershell mono-* php* ruby*

- name: set up requirements
run: make requirements
Expand All @@ -65,11 +70,15 @@ jobs:
- name: provision
run: make dev.provision.${{matrix.services}}

- name: dev.up
- name: "Bring up services"
run: make dev.up.${{matrix.services}}

- name: dev.check
run: make dev.check.${{matrix.services}}
- name: "Wait for services to become ready"
run: |
# Wait a reasonable amount of time for services to come up. If they
# don't, then call the checks one more time to ensure that diagnostic
# information is printed out. (It's suppressed by wait-for.)
timeout 5m make dev.wait-for.${{matrix.services}} || timeout 1m make dev.check.${{matrix.services}}
- name: notify on failure
if: ${{ failure() && github.ref == 'refs/heads/master' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
Expand Down
Loading

0 comments on commit aeefa72

Please sign in to comment.