summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-10-28 01:24:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-10-28 01:24:55 +0900
commitd964c5f27f0aa37f0d5703b1bda928da699111c6 (patch)
tree4439b3123a87f6a9687804910ede8e688d8ef1d5
parentImprove CI (diff)
downloadsharkey-d964c5f27f0aa37f0d5703b1bda928da699111c6.tar.gz
sharkey-d964c5f27f0aa37f0d5703b1bda928da699111c6.tar.bz2
sharkey-d964c5f27f0aa37f0d5703b1bda928da699111c6.zip
remove circleci configuration
-rw-r--r--.circleci/config.yml49
-rw-r--r--.circleci/misskey/default.yml12
-rw-r--r--.github/misskey/test.yml (renamed from .circleci/misskey/test.yml)0
-rw-r--r--test/test.yml6
4 files changed, 3 insertions, 64 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index a29b31a045..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-version: 2.1
-
-executors:
- docker:
- working_directory: /tmp/workspace
- docker:
- - image: docker:latest
-
-jobs:
- docker:
- parameters:
- with_deploy:
- type: boolean
- default: false
- executor: docker
- steps:
- - checkout
- - setup_remote_docker:
- version: 19.03.13
- - run:
- name: Build
- command: |
- docker build -t misskey/misskey .
- - when:
- condition: <<parameters.with_deploy>>
- steps:
- - run:
- name: Deploy
- command: |
- if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
- then
- apk update && apk add jq
- docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
- docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
- docker push -a misskey/misskey
- else
- echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
- fi
-
-workflows:
- version: 2
- docker:
- jobs:
- - docker:
- name: auto-build
- with_deploy: true
- filters:
- branches:
- only: master
diff --git a/.circleci/misskey/default.yml b/.circleci/misskey/default.yml
deleted file mode 100644
index ae18a841bd..0000000000
--- a/.circleci/misskey/default.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-url: 'http://misskey.local'
-port: 8080
-db:
- host: localhost
- port: 5432
- db: test-misskey
- user: postgres
- pass: ''
-redis:
- host: localhost
- port: 6379
-id: aid
diff --git a/.circleci/misskey/test.yml b/.github/misskey/test.yml
index ae18a841bd..ae18a841bd 100644
--- a/.circleci/misskey/test.yml
+++ b/.github/misskey/test.yml
diff --git a/test/test.yml b/test/test.yml
index 2d3094653e..ae18a841bd 100644
--- a/test/test.yml
+++ b/test/test.yml
@@ -1,12 +1,12 @@
url: 'http://misskey.local'
-port: 61812
+port: 8080
db:
host: localhost
- port: 54312
+ port: 5432
db: test-misskey
user: postgres
pass: ''
redis:
host: localhost
- port: 56312
+ port: 6379
id: aid