Skip to content

Commit f2ec0a5

Browse files
MartijnRMartijnR
committed
Bulk removal of ODK stuff and deployment
1 parent 75de4b9 commit f2ec0a5

File tree

720 files changed

+167
-18672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

720 files changed

+167
-18672
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,5 @@
1-
version: 2
1+
version: 3
22
jobs:
3-
build-odk1:
4-
working_directory: ~/work
5-
docker:
6-
- image: circleci/python:latest
7-
steps:
8-
- checkout
9-
- run:
10-
name: Install checkout requirements
11-
command: |
12-
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
13-
sudo apt-get install git-lfs
14-
git lfs install
15-
- run:
16-
name: Checkout binaries
17-
command: git lfs pull
18-
- run:
19-
name: Install build requirements
20-
command: |
21-
sudo apt-get install pngquant
22-
sudo apt-get install python-enchant
23-
sudo pip install -r requirements.txt
24-
- run:
25-
name: Style Guide Check
26-
command: |
27-
paths=$(git diff origin/master... --name-only)
28-
echo $paths
29-
sudo python style-test.py $paths -r odk1-src
30-
sudo python style-test.py $paths -r shared-src
31-
- run:
32-
name: Build ODK1 Documentation
33-
command: make odk1-deploy
34-
- run:
35-
name: Check spelling of ODK1 Documentation
36-
command: make odk1-spell-check
37-
- run:
38-
name: Build LaTex of ODK1 Documentation
39-
command: make odk1-latex
40-
- run:
41-
name: Compress images
42-
command: pngquant odk1-build/_images/*.png --force --ext .png --verbose
43-
- store_artifacts:
44-
path: odk1-build
45-
destination: odk1-build
46-
- persist_to_workspace:
47-
root: ~/work
48-
paths:
49-
- odk1-build/*
50-
- odk1-config/*
51-
build-pdf-odk1:
52-
working_directory: ~/work
53-
docker:
54-
- image: schickling/latex
55-
steps:
56-
- attach_workspace:
57-
at: ~/work
58-
- run:
59-
name: Build PDF
60-
command: |
61-
cd odk1-build/latex
62-
xelatex OpenDataKit.tex
63-
xelatex OpenDataKit.tex
64-
mkdir -p ../_downloads
65-
mv OpenDataKit.pdf ../_downloads/ODK-Documentation.pdf
66-
- store_artifacts:
67-
path: odk1-build/_downloads/ODK-Documentation.pdf
68-
destination: ODK-Documentation.pdf
69-
- persist_to_workspace:
70-
root: ~/work
71-
paths:
72-
- odk1-build/*
733
build-odkx:
744
working_directory: ~/work
755
docker:
@@ -140,102 +70,12 @@ jobs:
14070
root: ~/work
14171
paths:
14272
- odkx-build/*
143-
deploy-odk1:
144-
working_directory: ~/work
145-
docker:
146-
- image: circleci/ruby:latest
147-
steps:
148-
- attach_workspace:
149-
at: ~/work
150-
- run:
151-
name: Install deploy requirements
152-
command: |
153-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
154-
sudo apt-get install -y software-properties-common
155-
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
156-
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
157-
sudo apt-get update
158-
sudo apt-get install -y adoptopenjdk-8-hotspot
159-
gem install s3_website && s3_website install
160-
fi
161-
- run:
162-
name: Push to S3
163-
command: |
164-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
165-
s3_website push --config-dir=odk1-config
166-
fi
167-
deploy-odkx:
168-
working_directory: ~/work
169-
docker:
170-
- image: circleci/ruby:latest
171-
steps:
172-
- attach_workspace:
173-
at: ~/work
174-
- run:
175-
name: Install deploy requirements
176-
command: |
177-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
178-
sudo apt-get install -y software-properties-common
179-
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
180-
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
181-
sudo apt-get update
182-
sudo apt-get install -y adoptopenjdk-8-hotspot
183-
gem install s3_website && s3_website install
184-
fi
185-
- run:
186-
name: Push to S3
187-
command: |
188-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
189-
s3_website push --config-dir=odkx-config
190-
fi
191-
deploy-shared:
192-
working_directory: ~/work
193-
docker:
194-
- image: circleci/ruby:latest
195-
steps:
196-
- attach_workspace:
197-
at: ~/work
198-
- run:
199-
name: Install deploy requirements
200-
command: |
201-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
202-
sudo apt-get install -y software-properties-common
203-
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
204-
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
205-
sudo apt-get update
206-
sudo apt-get install -y adoptopenjdk-8-hotspot
207-
gem install s3_website && s3_website install
208-
fi
209-
- run:
210-
name: Push to S3
211-
command: |
212-
if [[ "$CIRCLE_PROJECT_USERNAME" == "opendatakit" ]]; then \
213-
s3_website push --config-dir=shared-config
214-
fi
215-
73+
21674
workflows:
217-
version: 2
218-
build_deploy:
75+
version: 3
76+
build:
21977
jobs:
220-
- build-odk1
221-
- build-pdf-odk1:
222-
requires:
223-
- build-odk1
22478
- build-odkx
22579
- build-pdf-odkx:
22680
requires:
22781
- build-odkx
228-
- deploy-odk1:
229-
requires:
230-
- build-odk1
231-
- build-pdf-odk1
232-
filters:
233-
branches:
234-
only: master
235-
- deploy-odkx:
236-
requires:
237-
- build-odkx
238-
- build-pdf-odkx
239-
filters:
240-
branches:
241-
only: master

‎Makefile

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
# You can set these variables from the command line.
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
7-
SPHINXPROJ = OpenDataKit
8-
ODK1_SRCDIR = odk1-src
7+
SPHINXPROJ = ODKX
98
ODKX_SRCDIR = odkx-src
109
SHARED_SRCDIR = shared-src
1110
COMPILE1_SRCDIR = tmp1-src
1211
COMPILE_X_SRCDIR = tmpx-src
13-
ODK1_BUILDDIR = odk1-build
1412
ODKX_BUILDDIR = odkx-build
1513

1614
# Put it first so that "make" without argument is like "make help".
@@ -19,95 +17,53 @@ help:
1917

2018
.PHONY: help Makefile
2119

22-
odk1-autobuild:
23-
sphinx-autobuild --poll -p 8080 -H 0.0.0.0 odk1-src odk1-build
24-
2520
odkx-autobuild:
2621
sphinx-autobuild --poll -p 8080 -H 0.0.0.0 odkx-src odkx-build
2722

28-
odk1-clean:
29-
rm -rf $(COMPILE1_SRCDIR)
30-
rm -rf $(ODK1_BUILDDIR)
31-
3223
odkx-clean:
3324
rm -rf $(COMPILE_X_SRCDIR)
3425
rm -rf $(ODKX_BUILDDIR)
3526

36-
odk1-clean-files:
37-
rm -rf $(COMPILE1_SRCDIR)
38-
rm -rf $(ODK1_BUILDDIR)/*
39-
4027
odkx-clean-files:
4128
rm -rf $(COMPILE_X_SRCDIR)
4229
rm -rf $(ODKX_BUILDDIR)/*
4330

44-
clean: odk1-clean odkx-clean
45-
46-
odk1-copy: odk1-clean-files
47-
mkdir $(COMPILE1_SRCDIR)
48-
cp -rf $(ODK1_SRCDIR)/* $(COMPILE1_SRCDIR)
49-
cp -rf $(SHARED_SRCDIR)/* $(COMPILE1_SRCDIR)
31+
clean: odkx-clean
5032

5133
odkx-copy: odkx-clean-files
5234
mkdir $(COMPILE_X_SRCDIR)
5335
cp -rf $(ODKX_SRCDIR)/* $(COMPILE_X_SRCDIR)
5436
cp -rf $(SHARED_SRCDIR)/* $(COMPILE_X_SRCDIR)
5537

56-
odk1: odk1-copy
57-
@$(SPHINXBUILD) -b dirhtml "$(COMPILE1_SRCDIR)" "$(ODK1_BUILDDIR)" $(SPHINXOPTS)
58-
5938
odkx: odkx-copy
6039
@$(SPHINXBUILD) -b dirhtml "$(COMPILE_X_SRCDIR)" "$(ODKX_BUILDDIR)" $(SPHINXOPTS)
6140

62-
odk1-deploy: odk1-copy
63-
@$(SPHINXBUILD) -W -b dirhtml "$(COMPILE1_SRCDIR)" "$(ODK1_BUILDDIR)" $(SPHINXOPTS)
64-
6541
odkx-deploy: odkx-copy
6642
@$(SPHINXBUILD) -W -b dirhtml "$(COMPILE_X_SRCDIR)" "$(ODKX_BUILDDIR)" $(SPHINXOPTS)
6743

68-
build-all: odk1 odkx
69-
70-
odk1-latex: odk1
71-
@$(SPHINXBUILD) -b latex "$(COMPILE1_SRCDIR)" "$(ODK1_BUILDDIR)"/latex $(SPHINXOPTS)
72-
python util/resize.py "$(ODK1_BUILDDIR)"
44+
build-all: odkx
7345

7446
odkx-latex: odkx
7547
@$(SPHINXBUILD) -b latex "$(COMPILE_X_SRCDIR)" "$(ODKX_BUILDDIR)"/latex $(SPHINXOPTS)
7648
python util/resize.py "$(ODKX_BUILDDIR)"
7749

78-
odk1-pdf: odk1-latex
79-
cd "$(ODK1_BUILDDIR)"/latex && \
80-
xelatex OpenDataKit.tex && \
81-
xelatex OpenDataKit.tex && \
82-
mkdir -p ../_downloads && \
83-
mv OpenDataKit.pdf ../_downloads/ODK-Documentation.pdf
84-
8550
odkx-pdf: odkx-latex
8651
cd "$(ODKX_BUILDDIR)"/latex && \
8752
xelatex OpenDataKitX.tex && \
8853
xelatex OpenDataKitX.tex && \
8954
mkdir -p ../_downloads && \
9055
mv OpenDataKitX.pdf ../_downloads/ODK-X-Documentation.pdf
9156

92-
odk1-style-check: odk1
93-
python style-test.py -r $(COMPILE1_SRCDIR)
94-
95-
odk1-spell-check: odk1
96-
sphinx-build -b spelling $(COMPILE1_SRCDIR) $(ODK1_BUILDDIR)/spelling
97-
python util/check-spelling-output.py $(ODK1_BUILDDIR)
98-
9957
odkx-style-check: odkx
10058
python style-test.py -r $(COMPILE_X_SRCDIR)
10159

10260
odkx-spell-check: odkx
10361
sphinx-build -b spelling $(COMPILE_X_SRCDIR) $(ODKX_BUILDDIR)/spelling
10462
python util/check-spelling-output.py $(ODKX_BUILDDIR)
10563

106-
odk1-check: odk1-style-check odk1-spell-check
107-
10864
odkx-check: odkx-style-check odkx-spell-check
10965

110-
check-all: odk1-check odkx-check
66+
check-all: odkx-check
11167

11268
test:
11369
pytest

0 commit comments

Comments
 (0)