Skip to content

Commit ba693ec

Browse files
authored
circle CI: update with orb and custom image (#124)
* ditto * replace with orb * fu
1 parent 13c486e commit ba693ec

File tree

2 files changed

+5
-70
lines changed

2 files changed

+5
-70
lines changed

.circleci/config.yml

+4-69
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,18 @@
11
version: 2.1
22

33
orbs:
4-
mirci:
5-
orbs:
6-
aws-s3: circleci/[email protected]
7-
commands:
8-
persist_docs:
9-
parameters:
10-
from:
11-
description: "Folder with generated docs"
12-
type: string
13-
steps:
14-
- persist_to_workspace:
15-
root: ~/project
16-
paths:
17-
- <<parameters.from>>
18-
19-
upload_docs_cmd:
20-
parameters:
21-
to:
22-
description: "S3 domain"
23-
type: string
24-
from:
25-
description: "Folder with generated docs"
26-
type: string
27-
steps:
28-
- attach_workspace:
29-
at: ~/project
30-
- aws-s3/sync:
31-
from: '<<parameters.from>>'
32-
to: 's3://<<parameters.to>>'
33-
overwrite: true
34-
jobs:
35-
upload_docs_job:
36-
docker:
37-
- image: circleci/python:latest
38-
parameters:
39-
to:
40-
description: "S3 domain"
41-
type: string
42-
from:
43-
description: "Folder with generated docs"
44-
type: string
45-
steps:
46-
- upload_docs_cmd:
47-
to: '<<parameters.to>>'
48-
from: '<<parameters.from>>'
4+
mirci: libmir/[email protected]
495

506
jobs:
517
build:
528
docker:
53-
- image: circleci/python:latest
54-
- image: circleci/buildpack-deps:latest
55-
environment:
56-
DMD: 2.085.1
57-
DUB: 1.11.0
9+
- image: libmir/circle-dlang
5810
steps:
59-
- run:
60-
name: Install dependencies
61-
working_directory: /
62-
command: |
63-
sudo apt -y -qq update
64-
sudo apt -y -qq install gcc make ninja-build
65-
sudo pip install meson
66-
curl -fsSL --retry 3 "http://downloads.dlang.org/releases/2.x/$DMD/dmd.$DMD.linux.tar.xz" | tar -C ~ -Jxf -
67-
curl -fsSL --retry 3 http://code.dlang.org/files/dub-${DUB}-linux-x86_64.tar.gz | tar -C ~/dmd2/linux/bin64 -zxf -
68-
echo 'export PATH=$HOME/dmd2/linux/bin64:$PATH' >> $BASH_ENV
69-
echo 'export LD_LIBRARY_PATH=$HOME/dmd2/linux/lib64:$PATH' >> $BASH_ENV
70-
- run:
71-
name: Test executables
72-
command: |
73-
dmd --version
74-
dub --version
7511
- checkout
7612
- run: git submodule sync && git submodule update --recursive --init
7713
- run: dub test
78-
- run: |
79-
meson build
80-
ninja -C build test
14+
- run: meson build
15+
- run: ninja -C build test
8116
- run: make -f doc/Makefile html
8217
- mirci/persist_docs:
8318
from: web

test_parser/run_asdf_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
asdf_config = "D ASDF Parser";
1717

1818
run_tests.programs[asdf_config] = {
19-
"url":"https://github.com/tamediadigital/asdf",
19+
"url":"https://github.com/libmir/asdf",
2020
"commands":[os.path.join(run_tests.PARSERS_DIR, "../../test_json-asdf")]
2121
}
2222

0 commit comments

Comments
 (0)