Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 0 additions & 36 deletions .circleci/config.yml

This file was deleted.

52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI

on:
pull_request:
types:
- opened
- synchronize
push:
branches:
- master
- staging
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ contains(fromJSON('["master", "staging"]'), github.ref_name) }}

jobs:
build:
runs-on: runs-on=${{ github.run_id }}/cpu=1+32/ram=1+32/family=m8+c8+r8+i8+m7+c7+r7+t4/image=ubuntu22-full-arm64/spot=lowest-price/extras=s3-cache

env:
ENVIRONMENT: production

steps:
- uses: runs-on/action@v2
with:
# See https://github.com/runs-on/action#options
metrics: cpu,memory
show_costs: summary
show_env: false

- name: Checkout code
uses: actions/checkout@v5

- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: '3.12'

- name: Install uv
uses: astral-sh/setup-uv@v7
with:
enable-cache: true

- name: Install dependencies
working-directory: sphinx
run: uv sync

- name: Build documentation
working-directory: sphinx
run: uv run sphinx-build -nW -b dirhtml -d build/doctrees ../source build/html
4 changes: 2 additions & 2 deletions deploy/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
label "staging"
}
environment {
CIRCLE_CI_TOKEN = credentials('CIRCLE_CI_TOKEN')
GITHUB_ACC = credentials('talkable-bot-deploy-token')
JENKINS_BUILD_USER_ID = ""
LOCAL_PORT="8080"
SLACK_CHANNEL = "deploy"
Expand All @@ -18,7 +18,7 @@ pipeline {
parameters {
choice(name: "DEPLOY_COMMAND",
choices: ["deploy", "ci_status"],
description: "DEPLOY - Start the default deployment\nCI_STATUS - Check the CircleCI build status")
description: "DEPLOY - Start the default deployment\nCI_STATUS - Check the GitHub Actions build status")
}
options {
buildDiscarder(logRotator(numToKeepStr: '15', daysToKeepStr: '14'))
Expand Down
20 changes: 10 additions & 10 deletions deploy/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ printenv | sort
TIMEFRAME_SECONDS=240
PROJECT_ROOT="talkable-docs"
SUBPROJECT="docs"
# CircleCI API v2 configuration
CIRCLE_CI_API_BASE="https://circleci.com/api/v2"
CIRCLE_CI_PROJECT_SLUG="gh/talkable/${PROJECT_ROOT}"
CIRCLE_CI_WEB_URL="https://app.circleci.com/pipelines/github/talkable/${PROJECT_ROOT}?branch=${BRANCH_NAME}"
# GitHub Actions configuration
GITHUB_API_BASE="https://api.github.com"
GITHUB_REPOSITORY="talkable/${PROJECT_ROOT}"
GITHUB_ACTIONS_WEB_URL="https://github.com/talkable/${PROJECT_ROOT}/actions?query=branch%3A${BRANCH_NAME}"

# Source shared CircleCI functions
# Source shared GitHub Actions functions
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${SCRIPT_DIR}/lib/circleci_common.sh"
source "${SCRIPT_DIR}/lib/github_actions_common.sh"

TASK=$1

Expand All @@ -24,14 +24,14 @@ print_help() {
clear
echo 'Available Commands:'
echo ' deploy - deploy current version of talkable-docs'
echo ' ci | cistatus | status - check CircleCI build status'
echo ' ci | cistatus | status - check GitHub Actions build status'
echo 'Example:'
echo ' deploy.sh deploy'
echo ' deploy.sh ci_status'
exit 0
}

# CircleCI status function is now sourced from lib/circleci_common.sh
# GitHub Actions status function is now sourced from lib/github_actions_common.sh

remote_ssh_exec() {
ssh -o StrictHostKeyChecking=no -i "$SSH_KEY" "$SSH_USER@$HOST_ENV" "$@"
Expand Down Expand Up @@ -62,12 +62,12 @@ EOF

case $TASK in
ci | ci_status | ci_only | status)
circleci_status
gh_status
deploy_check
;;
deploy)
echo "Starting deployment..."
circleci_status
gh_status
deploy_docs
deploy_check
;;
Expand Down
152 changes: 0 additions & 152 deletions deploy/lib/circleci_common.sh

This file was deleted.

Loading