Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8e7b755
Working on Drupal 10 test deploy.
gregharvey Feb 5, 2025
161ff80
Updating APT.
gregharvey Feb 5, 2025
908dc3f
Using the controller container.
gregharvey Feb 5, 2025
4466686
Fetching branches from github.
gregharvey Feb 5, 2025
d14522d
Fetched the wrong project.
gregharvey Feb 5, 2025
d97b9f0
Going for floating head approach.
gregharvey Feb 5, 2025
ad1478b
Making the build dir.
gregharvey Feb 5, 2025
6bf99f1
Moving gawk.csh out of the way.
gregharvey Feb 5, 2025
23d3327
Moving hosts entry to ce-deploy.
gregharvey Feb 6, 2025
ad786b7
Merge branch '1.x' of github.com:codeenigma/ce-deploy into fixing_ci-…
gregharvey Feb 6, 2025
6c068a8
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
b42b8ae
Merge branch '1.x' into fixing_ci
gregharvey Feb 6, 2025
d3a81e0
Trying the ce-dev approach again.
gregharvey Feb 6, 2025
6abdc90
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
a0f9312
Configuring Git on the controller container.
gregharvey Feb 6, 2025
3478b05
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
52f3324
Trying full path to git.
gregharvey Feb 6, 2025
5b4a18e
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
924ce87
Trying an API call to ce-deploy1.
gregharvey Feb 6, 2025
eeb2fbb
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
82da701
Adding a git fetch to the ce-deploy self-update function.
gregharvey Feb 6, 2025
def8c7f
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
05ffd82
Removing obsolete builds.
gregharvey Feb 6, 2025
a5b7afe
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
f40957a
Making linting job have clearer steps.
gregharvey Feb 6, 2025
9295204
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
ffce2ab
Linter does need sudo to install.
gregharvey Feb 6, 2025
ce4f34a
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
4121641
Adding a dist-upgrade.
gregharvey Feb 6, 2025
fcc429e
Adding new lines for visual tidiness.
gregharvey Feb 6, 2025
6f76ff6
Moving ansible-lint to previous step.
gregharvey Feb 6, 2025
7d8c0a0
Latest ubuntu seems broken.
gregharvey Feb 6, 2025
835bf19
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
33b4700
Finalising lint job.
gregharvey Feb 6, 2025
3de59ba
Merge branch 'fixing_ci' into fixing_ci-PR-1.x
gregharvey Feb 6, 2025
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
27 changes: 15 additions & 12 deletions .github/workflows/ce-deploy-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,28 @@ name: Linting
on: pull_request

jobs:
# Set the job key. The key is displayed as the job name
# when a job name is not provided
run-linting:
# Name the Job
if: ${{ always() }}
name: Linting
# Set the type of machine to run on
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # at time of writing ubuntu-latest has broken ansible

steps:
# Checks out a copy of your repository on the ubuntu-latest machine
- name: Checkout code
uses: actions/checkout@v2
- name: Checkout code.
uses: actions/checkout@v4

# Linter checks.
- name: Run linters.
if: ${{ always() }}
- name: Install linters.
run: |
sudo apt-get update
sudo apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew"
sudo apt-get install -y ansible-lint yamllint shellcheck
find ./roles -name "*.yml" | xargs ansible-lint
yamllint ./roles
cd scripts && shellcheck *.sh

- name: Run ansible-lint.
run: find ./roles -name "*.yml" | xargs ansible-lint

- name: Run yamllint.
run: yamllint ./roles

- name: Run shellcheck.
run: cd scripts && shellcheck *.sh
31 changes: 31 additions & 0 deletions .github/workflows/ce-deploy-test-cewww.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Run test on ce-deploy1

# Run this workflow when a PR to 1.x is raised
on:
pull_request:
branches:
- 1.x

jobs:
# Set the job key. The key is displayed as the job name
# when a job name is not provided
run-tests:
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
# Name the Job
name: Run Drupal test build
# Set the type of machine to run on
runs-on: ubuntu-latest

steps:
# Call the GitLab API to trigger a test build
- name: Call the GitLab API on ce-deploy1
env:
GITLAB_TOKEN: ${{ secrets.CEWWW_DEV_TOKEN }}
run: |
curl --request POST \
--form token=$GITLAB_TOKEN \
--form ref=dev \
--form "variables[CE_DEPLOY_BRANCH]=${{ github.event.pull_request.head.ref }}" \
"https://gitlab.ce-deploy1.codeenigma.net/api/v4/projects/4/trigger/pipeline"
echo -e "\n\n"
echo "### Request sent - see https://gitlab.ce-deploy1.codeenigma.net/web/ce-www/-/pipelines for results"
55 changes: 0 additions & 55 deletions .github/workflows/ce-deploy-test-drupal8.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/ce-deploy-test-drupal9.yml

This file was deleted.

6 changes: 4 additions & 2 deletions scripts/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ parse_options(){
"--config-branch")
shift
git_checkout_config_dir "$1"
;;
;;
"--boto-profile")
shift
BOTO_PROFILE="$1"
Expand All @@ -116,7 +116,7 @@ parse_options(){
"--build-id")
shift
BUILD_ID="$1"
;;
;;
*)
usage
exit 1
Expand Down Expand Up @@ -229,6 +229,8 @@ ansible_play(){
# @param $1 absolute path to local repo.
# @param $2 branch to checkout.
git_checkout(){
# We need to fetch first for new branches.
git -C "$1" fetch origin "$2"
git -C "$1" checkout "$2"
git -C "$1" pull origin "$2"
}
Expand Down