Skip to content

Commit 4b3fd7b

Browse files
committed
Fix CircleCI Config
1 parent 47df282 commit 4b3fd7b

File tree

3 files changed

+66
-26
lines changed

3 files changed

+66
-26
lines changed

.circleci/config.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
version: 2
2+
3+
jobs:
4+
unit-tests:
5+
docker:
6+
- image: circleci/php:7.0
7+
steps:
8+
- run: sudo composer self-update && sudo composer self-update --1
9+
- checkout
10+
- restore_cache:
11+
keys:
12+
- dependencies-{{ checksum "composer.lock" }}
13+
- composer-cache
14+
15+
- run: composer install -n -o --no-scripts
16+
- save_cache:
17+
key: dependencies-{{ checksum "composer.lock" }}
18+
paths:
19+
- vendor
20+
- save_cache:
21+
key: composer-cache
22+
paths:
23+
- ~/.composer/cache
24+
25+
- run: mkdir phpunit
26+
- run: ./vendor/bin/phpunit --log-junit phpunit/junit.xml
27+
- store_test_results:
28+
path: phpunit
29+
- store_artifacts:
30+
path: phpunit
31+
32+
deploy:
33+
machine:
34+
enabled: true
35+
docker:
36+
- image: circleci/php:7.0
37+
steps:
38+
- add_ssh_keys:
39+
fingerprints:
40+
- "00:49:b0:d3:41:35:99:f2:a7:d1:02:46:02:07:06:09"
41+
- run: sudo composer self-update && sudo composer self-update --1
42+
- checkout
43+
- restore_cache:
44+
keys:
45+
- dependencies-{{ checksum "composer.lock" }}
46+
- composer-cache
47+
48+
- run: composer install -n -o --no-scripts
49+
- run: ./vendor/bin/dep deploy
50+
51+
workflows:
52+
version: 2
53+
build-and-deploy:
54+
jobs:
55+
- unit-tests
56+
- deploy:
57+
requires:
58+
- unit-tests
59+
filters:
60+
branches:
61+
only: master
62+

circle.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

deploy.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
require 'recipe/composer.php';
55

66
// Set configurations
7-
set('repository', 'git@github.com:AmsterdamPHP/console.git');
7+
set('repository', 'https://github.com/AmsterdamPHP/console.git');
88
set('shared_files', ['.env']);
99
set('shared_dirs', []);
1010
set('writable_dirs', []);
1111

1212
// Configure servers
13-
server('production', 'amsterdamphp.nl')
14-
->user('phpamst01')
15-
->identityFile()
13+
server('production', '87.233.177.218')
14+
->user('webdev')
15+
->identityFile(null, '~/.ssh/id_rsa_0049b0d3413599f2a7d1024602070609')
1616
->env('deploy_path', '/data/www/console');
1717

1818
after('deploy:update_code', 'deploy:shared');

0 commit comments

Comments
 (0)