Skip to content

Commit f65e615

Browse files
JonnxJonnx
committed
fix(merge-conflicts): resolved merge conflicts from master branch
2 parents fd9c7af + 6dff4fb commit f65e615

17 files changed

Lines changed: 2698 additions & 412 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
version: 2
2+
3+
workflows:
4+
version: 2
5+
6+
build-test-deploy:
7+
jobs:
8+
- build:
9+
filters:
10+
branches:
11+
ignore: main
12+
tags:
13+
only: /.*/
14+
- test-unit:
15+
requires:
16+
- build
17+
filters:
18+
branches:
19+
ignore: main
20+
- test-browser:
21+
requires:
22+
- build
23+
filters:
24+
branches:
25+
ignore: main
26+
- deploy-staging:
27+
requires:
28+
- build
29+
filters:
30+
tags:
31+
only: /.*/
32+
branches:
33+
ignore: /.*/
34+
- deploy-production:
35+
requires:
36+
- build
37+
filters:
38+
branches:
39+
only:
40+
- prod
41+
42+
- tag-version:
43+
filters:
44+
branches:
45+
only: main
46+
47+
48+
defaults: &defaults
49+
working_directory: /home/circleci/mapmarker.io
50+
docker:
51+
- image: cimg/php:8.1-browsers
52+
53+
jobs:
54+
build:
55+
<<: *defaults
56+
steps:
57+
# fetch source & prepare build image
58+
- checkout
59+
60+
- restore_cache:
61+
keys:
62+
# "composer.lock" can be used if it is committed to the repo
63+
- v1-dependencies-composer-{{ checksum "composer.lock" }}
64+
# fallback to using the latest cache if no exact match is found
65+
- v1-dependencies-composer-
66+
- run: composer install -n --prefer-dist --no-progress --ignore-platform-req=ext-gd
67+
- save_cache:
68+
key: v1-dependencies-composer-{{ checksum "composer.lock" }}
69+
paths:
70+
- ./vendor
71+
72+
# yarn (with dep caching)
73+
- restore_cache:
74+
keys:
75+
# "composer.lock" can be used if it is committed to the repo
76+
- v1-dependencies-yarn-{{ checksum "package.json" }}
77+
# fallback to using the latest cache if no exact match is found
78+
- v1-dependencies-yarn-
79+
- run: yarn
80+
- save_cache:
81+
key: v1-dependencies-yarn-{{ checksum "package.json" }}
82+
paths:
83+
- ./node_modules
84+
85+
# compile js / css
86+
- run: yarn prod
87+
88+
# save build to workspace for additional steps
89+
- persist_to_workspace:
90+
root: /home/circleci
91+
paths:
92+
- mapmarker.io
93+
94+
tag-version:
95+
<<: *defaults
96+
steps:
97+
- checkout
98+
# load contents from build step
99+
- run: yarn
100+
- run:
101+
name: Tag version
102+
command: yarn release
103+
104+
test-unit:
105+
<<: *defaults
106+
steps:
107+
# load contents from build step
108+
- attach_workspace:
109+
at: /home/circleci
110+
# run tests with phpunit
111+
- run:
112+
name: Prepare
113+
command: |
114+
mkdir ./test-results
115+
mkdir ./test-results/junit
116+
touch database/database.sqlite
117+
cp .env.circleci .env
118+
php artisan key:generate
119+
php artisan migrate
120+
- run:
121+
name: Tests
122+
command: ./vendor/bin/phpunit --log-junit ./test-results/junit/results.xml
123+
124+
- store_test_results:
125+
path: test-results
126+
127+
test-browser:
128+
<<: *defaults
129+
steps:
130+
# load contents from build step
131+
- attach_workspace:
132+
at: /home/circleci
133+
134+
- run:
135+
name: Setup Chrome
136+
command: |
137+
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
138+
sudo apt install ./google-chrome-stable_current_amd64.deb
139+
140+
- run:
141+
name: "Prepare"
142+
command: |
143+
cp .env.circleci .env
144+
touch database/database.sqlite
145+
php artisan key:generate
146+
php artisan migrate
147+
php artisan dusk:chrome-driver --detect
148+
149+
- run:
150+
name: Start Server
151+
command: php artisan serve --host=localhost --port=80
152+
background: true
153+
154+
- run:
155+
name: Start Chrome Driver
156+
command: ./vendor/laravel/dusk/bin/chromedriver-linux
157+
background: true
158+
159+
- run:
160+
name: Run Browser Tests
161+
command: php artisan dusk
162+
163+
- store_artifacts:
164+
path: /home/circleci/mapmarker.io/tests/Browser/screenshots
165+
166+
deploy-staging:
167+
<<: *defaults
168+
steps:
169+
- attach_workspace:
170+
at: /home/circleci
171+
- checkout
172+
- run:
173+
name: Deploy Staging
174+
command: yarn vapor deploy staging --commit $CIRCLE_SHA1 --message "$(git log --format=%B -n 1 $CIRCLE_SHA1)"
175+
- run:
176+
name: Notify velocity.codeclimate
177+
command: bash node_modules/circleci-util/src/notify-deployments.sh -o codeclimate-velocity
178+
179+
deploy-production:
180+
<<: *defaults
181+
steps:
182+
- attach_workspace:
183+
at: /home/circleci
184+
- checkout
185+
- run:
186+
name: Deploy Production
187+
command: yarn vapor deploy production --commit $CIRCLE_SHA1 --message "$(git log --format=%B -n 1 $CIRCLE_SHA1)"
188+
- run:
189+
name: Notify velocity.codeclimate
190+
command: bash node_modules/circleci-util/src/notify-deployments.sh -o codeclimate-velocity

‎.env.circleci‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
APP_NAME=Laravel
2+
APP_ENV=local
3+
APP_KEY=
4+
APP_DEBUG=true
5+
APP_URL=http://localhost
6+
7+
LOG_CHANNEL=stack
8+
LOG_DEPRECATIONS_CHANNEL=null
9+
LOG_LEVEL=debug
10+
11+
DB_CONNECTION=sqlite
12+
13+
BROADCAST_DRIVER=log
14+
CACHE_DRIVER=file
15+
FILESYSTEM_DISK=local
16+
QUEUE_CONNECTION=sync
17+
SESSION_DRIVER=file
18+
SESSION_LIFETIME=120
19+
20+
MEMCACHED_HOST=127.0.0.1
21+
22+
REDIS_HOST=127.0.0.1
23+
REDIS_PASSWORD=null
24+
REDIS_PORT=6379
25+
26+
MAIL_MAILER=smtp
27+
MAIL_HOST=mailhog
28+
MAIL_PORT=1025
29+
MAIL_USERNAME=null
30+
MAIL_PASSWORD=null
31+
MAIL_ENCRYPTION=null
32+
MAIL_FROM_ADDRESS="hello@example.com"
33+
MAIL_FROM_NAME="${APP_NAME}"
34+
35+
AWS_ACCESS_KEY_ID=
36+
AWS_SECRET_ACCESS_KEY=
37+
AWS_DEFAULT_REGION=us-east-1
38+
AWS_BUCKET=
39+
AWS_USE_PATH_STYLE_ENDPOINT=false
40+
41+
PUSHER_APP_ID=
42+
PUSHER_APP_KEY=
43+
PUSHER_APP_SECRET=
44+
PUSHER_APP_CLUSTER=mt1
45+
46+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
47+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.github/workflows/main-tag-version.yml‎

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

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12
1+
14

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# [1.2.0](https://github.com/mapmarker/mapmarker.io/compare/1.1.0...1.2.0) (2022-06-21)
2+
3+
4+
### Features
5+
6+
* **circleci:** changed job filters for version tags ([17fa6fe](https://github.com/mapmarker/mapmarker.io/commit/17fa6fe2dfd5a0b2b7135c0f80f16568d9a69c66))
7+
8+
# [1.1.0](https://github.com/mapmarker/mapmarker.io/compare/v1.0.1...1.1.0) (2022-06-21)
9+
10+
11+
### Bug Fixes
12+
13+
* **versioning:** installed @semantic-release/git ([6b0743f](https://github.com/mapmarker/mapmarker.io/commit/6b0743f6a9cee4c9647bc71a0173f98f20ec21e5))
14+
15+
16+
### Features
17+
18+
* **versioning:** add main to versioning branch ([2c4a507](https://github.com/mapmarker/mapmarker.io/commit/2c4a507ecbac3bbd360be97e3bd2b780ed6b2155))
19+
* **versioning:** add semantic-release configuration ([c7a9ccd](https://github.com/mapmarker/mapmarker.io/commit/c7a9ccde64017d15aea861d6cb8d521f7cf13f0e))
20+
121
# Changelog
222

323
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"require-dev": {
1717
"fakerphp/faker": "^1.9.1",
18+
"laravel/dusk": "^6.24",
1819
"laravel/sail": "^1.14",
1920
"mockery/mockery": "^1.4.4",
2021
"nunomaduro/collision": "^6.1",

0 commit comments

Comments
 (0)