From 5a97eee8e703a16b288ffb2d616d414da61d62cc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jul 2020 23:21:28 -0600
Subject: [PATCH] Switch all CI over to Buildkite
---
.circleci/config.yml | 50 --------------------------------------------
appveyor.yml | 36 -------------------------------
build.ps1 | 5 -----
ci-complement.sh | 2 ++
4 files changed, 2 insertions(+), 91 deletions(-)
delete mode 100644 .circleci/config.yml
delete mode 100644 appveyor.yml
delete mode 100644 build.ps1
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 8cb889d6..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: 2
-jobs:
- complement:
- docker:
- - image: circleci/golang:1.14
- environment:
- GO111MODULE: "on"
- COMPLEMENT_BASE_IMAGE: complement-media-repo
- COMPLEMENT_VERSION_CHECK_ITERATIONS: 400
- steps:
- - setup_remote_docker
- - checkout
- - run:
- name: build complement image
- command: 'docker build -t complement-media-repo -f Complement.Dockerfile .'
- - run:
- name: fix script
- command: 'chmod +x ci-complement.sh'
- - run:
- name: run complement
- command: './ci-complement.sh'
- build:
- docker:
- - image: circleci/golang:1.14
- environment:
- GO111MODULE: "on"
- working_directory: /go/src/github.com/turt2live/matrix-media-repo
- steps:
- - checkout
- - run:
- name: build binaries
- command: './build.sh'
- - store_artifacts:
- path: bin/media_repo
- destination: media_repo
- - store_artifacts:
- path: bin/import_synapse
- destination: import_synapse
- - store_artifacts:
- path: bin/gdpr_export
- destination: gdpr_export
- - store_artifacts:
- path: bin/gdpr_import
- destination: gdpr_import
-workflows:
- version: 2
- build_and_test:
- jobs:
- - build
- - complement
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 6414a746..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "{build}"
-
-clone_folder: c:\gopath\src\github.com\turt2live\matrix-media-repo
-
-environment:
- GOPATH: c:\gopath
- GOVERSION: 1.14
-
-init:
- - git config --global core.autocrlf input
-
-install:
- # Install the specific Go version.
- - rmdir c:\go /s /q
- - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi
- - msiexec /i go%GOVERSION%.windows-amd64.msi /q
- - set PATH=c:\go\bin;c:\gopath\bin;%PATH%
- - go version
- - go env
-
-build_script:
- - set GOBIN=%CD%/bin
- - set GO111MODULE=on
- - ps: .\build.ps1
-
-artifacts:
- - path: bin/media_repo.exe
- name: media_repo.exe
- - path: bin/import_synapse.exe
- name: import_synapse.exe
- - path: bin/gdpr_export.exe
- name: gdpr_export.exe
- - path: bin/gdpr_import.exe
- name: gdpr_import.exe
-
-test_script: [] # https://github.com/turt2live/matrix-media-repo/issues/40
diff --git a/build.ps1 b/build.ps1
deleted file mode 100644
index d225b9e8..00000000
--- a/build.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-$GitCommit = (git rev-list -1 HEAD)
-$Version = (git describe --tags)
-go install -v ./cmd/compile_assets
-bin\compile_assets.exe
-go install -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.GitCommit=$GitCommit -X github.com/turt2live/matrix-media-repo/common/version.Version=$Version" -v ./cmd/...
diff --git a/ci-complement.sh b/ci-complement.sh
index 2b23a306..5d4ca09b 100644
--- a/ci-complement.sh
+++ b/ci-complement.sh
@@ -2,4 +2,6 @@
git clone --depth=1 https://github.com/matrix-org/complement.git CI_COMPLEMENT
cd CI_COMPLEMENT
+git fetch origin pull/14/head:complement-with-timeout
+git checkout complement-with-timeout
go test -run '^(TestMediaWithoutFileName)$' -v ./tests
--
GitLab