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
45 changes: 0 additions & 45 deletions Dockerfile.gitlab

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile.web
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ COPY --from=build --link /src/_build/install/default/bin/ocaml-ci-web /usr/local

## Load profile-pictures of registered organisations
RUN mkdir -p /profile-pictures/github
RUN mkdir -p /profile-pictures/gitlab
COPY --from=build --link /src/bin/add-profile-picture /usr/local/bin
COPY --from=build --link /src/deploy-data/github-organisations.txt /github-organisations.txt
COPY --from=build --link /src/deploy-data/gitlab-organisations.txt /gitlab-organisations.txt
RUN xargs -n 1 /usr/local/bin/add-profile-picture --github < /github-organisations.txt
RUN xargs -n 1 /usr/local/bin/add-profile-picture --gitlab < /gitlab-organisations.txt
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ If you want to build the whole system, the easiest way is using Docker:

```sh
docker build -f Dockerfile -t ocaml-ci-service .
docker build -f Dockerfile.gitlab -t ocaml-ci-gitlab .
docker build -f Dockerfile.web -t ocaml-ci-web .
```

Expand Down Expand Up @@ -136,7 +135,7 @@ $ ocaml-ci mirage/irmin pull/867 alpine-3.10-ocaml-4.08 cancel

## Deployment

`ocaml-ci` is deployed as three docker images built from `Dockerfile`, `Dockerfile.gitlab` and `Dockerfile.web`, with
`ocaml-ci` is deployed as two docker images built from `Dockerfile` and `Dockerfile.web`, with
the live service following `live-engine` for the backend and `live-www` for the frontend.
An ocurrent-deployer [pipeline](deploy.ci.dev) watches these branches, performing a docker build
and deploy whenever it sees a new commit. The live branches should typically contain commits from `master` plus potentially
Expand Down
20 changes: 4 additions & 16 deletions bin/add-profile-picture
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

usage() {
cat >&2 <<EOF
usage: add-profile-picture [--github | --gitlab] ORGANISATION_NAME
usage: add-profile-picture --github ORGANISATION_NAME

Add the organisation ORGANISATION in git-forge GITFORGE to ocaml-ci.
Add the GitHub organisation ORGANISATION to ocaml-ci.

Known git-forges are "github" and "gitlab"

Example: add-organisation --github ocurrent
Example: add-profile-picture --github ocurrent

EOF
exit 1
Expand All @@ -26,10 +24,6 @@ while echo "${1:-}" | grep -q '^-'; do
shift
GITFORGE="github"
;;
--gitlab)
shift
GITFORGE="gitlab"
;;
*)
echo >&2 "Unknown flag: $1"
usage
Expand All @@ -40,15 +34,9 @@ if [ $# -ne 1 ]; then
usage
fi

PROFILE_PICTURE_URL=""
ORGANISATION_NAME=$1
PROFILE_PICTURE_PATH="/profile-pictures/$GITFORGE/$ORGANISATION_NAME.png"

if [ "$GITFORGE" = "github" ]; then
PROFILE_PICTURE_URL="https://github.com/$ORGANISATION_NAME.png?size=200"
else
PROFILE_PICTURE_URL="$(curl -X GET https://gitlab.com/api/v4/users\?username="$ORGANISATION_NAME" | jq '.[] | .avatar_url' | sed 's/"//g')" >/dev/null
fi
PROFILE_PICTURE_URL="https://github.com/$ORGANISATION_NAME.png?size=200"

if [ "$PROFILE_PICTURE_URL" = "" ]; then
echo "ERROR: Profile picture lookup for $ORGANISATION_NAME"
Expand Down
5 changes: 0 additions & 5 deletions deploy-data/gitlab-organisations.txt

This file was deleted.

18 changes: 0 additions & 18 deletions doc/gitlab-dev.md

This file was deleted.

21 changes: 0 additions & 21 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -87,27 +87,6 @@
(prometheus-app (>= 1.2))
(timedesc (>= 0.9.0))))

(package
(name ocaml-ci-gitlab)
(synopsis "Test OCaml projects on GitLab")
(description "Test OCaml projects on GitLab")
(depends
(ocaml (>= 4.14))
dune
ocaml-ci
ocaml-ci-service
current
current_git
current_gitlab
current_docker
(alcotest (and (>= 1.7.0) :with-test))
(cmdliner (>= 1.1.1))
(fmt (>= 0.8.9))
(gitlab-unix (>= 0.1.8))
(logs (>= 0.7.0))
(odoc :with-doc)
(prometheus-app (>= 1.2))))

(package
(name ocaml-ci-client)
(synopsis "Command-line client for ocaml-ci")
Expand Down
72 changes: 0 additions & 72 deletions gitlab/dune

This file was deleted.

17 changes: 0 additions & 17 deletions gitlab/gitlab.ml

This file was deleted.

51 changes: 0 additions & 51 deletions gitlab/local.ml

This file was deleted.

Loading