Skip to content

Commit d764056

Browse files
authored
Alpha version of the translated book and huge french version improvements (#36)
* Adding initial translation in english * Exact translations for citations * Drastically improved english version, reworded small part of fr chapter * Fixed links * Now supporting CI for both languages * Fished links * Fished links * Fished links * Fixed references * Fixed MD links to titles, adapted FR links to en-US or en-CA resources, adapted salaries to US ones, adapted some explanation for americans * removed 'in french' mentions * Improved README for english version * Added english files and drastically improved translations * Improved presentation of readme * Added book's landing page * Adjusted visuals * Editing links * Updated links * Updated link * Massive correction of spelling, expressions and formatting. * Improved display of links to books * Fixed wording * Added semicolons formalism * Formatting table * Added reference to retex/debrief * Added newpage at some table locations * Bumping version to 1.1.0-alpha * Improved PDF version layout and updated citation reference * Fixed link fragment * Updated CITATION reference * Updating condition on which the check-404-links is run * Fixed broken links * Increasing timeout for latribune.fr * Avoiding timeout for latribune.fr
1 parent 980e74c commit d764056

File tree

270 files changed

+5620
-557
lines changed

Some content is hidden

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

270 files changed

+5620
-557
lines changed

.404-links.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ ignore:
3030
- https://www.nic.in/servicecontents/national-cloud # 503
3131
- https://www.gov.uk/government/publications/defence-artificial-intelligence-strategy # Timeout
3232
- https://www.defense.gouv.fr/ema/actualites/voeux-du-chef-detat-major-armees # Timeout
33+
- https://nsf.dev.nato.int/ # Timeout
34+
- https://www.latribune.fr/entreprises-finance/industrie/aeronautique-defense/satellites-europeens-lances-par-spacex-la-terrible-defaite-de-l-europe-spatiale-937632.html # Timeout (protection)
3335
delay: # Perform a pause of X ms at each call matching the url
3436
'https://gitlab.com': 500
3537
'https://gitlab.biterg.io': 1000

.github/workflows/markdownchecks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
# Only on main or PR to main
1010
check-404-links:
1111
name: Check for dead links
12-
if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.head_ref == 'refs/heads/main')
12+
if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main')
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Checkout

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414

15-
- name: That's funny
15+
- name: That's a prank
1616
shell: bash
1717
run: |
1818
echo "Updating a published book is not currently natively possible through Amazon APIs :)"

.github/workflows/render.yml

Lines changed: 73 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010

1111
jobs:
1212

13-
render-book:
14-
name: Render FR book
13+
render-books:
14+
name: Render books
1515
runs-on: ubuntu-20.04
1616
steps:
1717
- name: Extract branch name
@@ -60,36 +60,51 @@ jobs:
6060
run: |
6161
mkdir -p "$HOME/.local/share/fonts"
6262
cp ./fra/templates/fonts/* "$HOME/.local/share/fonts"
63+
cp ./eng/templates/fonts/* "$HOME/.local/share/fonts"
6364
6465
- name: Render PDF
6566
run: |
6667
sed -i -E "s/date: .+/date: ${{ steps.date.outputs.date }} - ${{ env.BOOK_VERSION }}/g" ./fra/metadata.yml
67-
cd ./fra && make pdf
68+
cd ./fra && make pdf && cd -
69+
cd ./eng && make pdf && cd -
6870
6971
- name: Render HTML
7072
run: |
71-
cd ./fra && make html
73+
cd ./fra && make html && cd -
74+
cd ./eng && make html && cd -
7275
7376
- uses: actions/upload-artifact@v3
7477
with:
75-
name: book-pdf-${{ env.BOOK_VERSION }}
78+
name: book-fr-pdf-${{ env.BOOK_VERSION }}
7679
path: ./fra/build/pdf/book.pdf
7780
retention-days: 1
7881

7982
- uses: actions/upload-artifact@v3
8083
with:
81-
name: book-html-${{ env.BOOK_VERSION }}
84+
name: book-fr-html-${{ env.BOOK_VERSION }}
8285
path: ./fra/build/html/
8386
retention-days: 1
8487

88+
- uses: actions/upload-artifact@v3
89+
with:
90+
name: book-en-pdf-${{ env.BOOK_VERSION }}
91+
path: ./eng/build/pdf/book.pdf
92+
retention-days: 1
93+
94+
- uses: actions/upload-artifact@v3
95+
with:
96+
name: book-en-html-${{ env.BOOK_VERSION }}
97+
path: ./eng/build/html/
98+
retention-days: 1
99+
85100

86101
# Pictures in the book may be referenced at some place in the text.
87102
# Ex: \ref{fig:name} in the text to reference the \label{fig:name} illustration.
88103
#
89104
# When badly referenced, pandoc generates a double questionmarks ("??") in the place
90105
# of the latex tags. This Action checks if there are no "??" in the generated PDF.
91-
check_latex_references:
92-
needs: render-book
106+
check-latex-references:
107+
needs: render-books
93108
name: Check valid latex references
94109
runs-on: ubuntu-22.04
95110
steps:
@@ -115,29 +130,47 @@ jobs:
115130
exit 1
116131
fi
117132
118-
- name: Download artifact
133+
- name: Download FR artifact
119134
uses: actions/download-artifact@v3
120135
with:
121-
name: book-pdf-${{ env.BOOK_VERSION }}
136+
name: book-fr-pdf-${{ env.BOOK_VERSION }}
122137
path: ./
123138

124-
- name: Get text from book
139+
- name: Get FR text from book
125140
run: |
126141
pdftotext ./book.pdf
127142
128-
- name: Get text from book
143+
- name: Get FR text from book
129144
run: |
130145
if grep -q "??" ./book.pdf; then
131146
echo "The file contains the string '??'"
132147
else
133148
echo "The file does not contain the string '??'"
134149
fi
135150
151+
- name: Download EN artifact
152+
uses: actions/download-artifact@v3
153+
with:
154+
name: book-en-pdf-${{ env.BOOK_VERSION }}
155+
path: ./
156+
157+
- name: Get EN text from book
158+
run: |
159+
pdftotext ./book.pdf
136160
137-
check_version_change:
161+
- name: Get EN text from book
162+
run: |
163+
if grep -q "??" ./book.pdf; then
164+
echo "The file contains the string '??'"
165+
else
166+
echo "The file does not contain the string '??'"
167+
fi
168+
169+
170+
check-version-change:
138171
name: "Check version change"
139172
runs-on: ubuntu-22.04
140-
needs: check_latex_references
173+
needs: check-latex-references
141174
outputs:
142175
version_changed: ${{ steps.check.outputs.version_changed }}
143176
steps:
@@ -163,9 +196,9 @@ jobs:
163196
fi
164197
165198
166-
deploy_to_gh_pages:
167-
if: needs.check_version_change.outputs.version_changed == 'true' && (github.ref == 'refs/heads/main')
168-
needs: check_version_change
199+
deploy-to-gh-pages:
200+
if: needs.check-version-change.outputs.version_changed == 'true' && (github.ref == 'refs/heads/main')
201+
needs: check-version-change
169202
runs-on: ubuntu-22.04
170203
name: Deploy to GitHub Pages
171204

@@ -191,14 +224,25 @@ jobs:
191224
- name: Download artifact
192225
uses: actions/download-artifact@v3
193226
with:
194-
name: book-html-${{ env.BOOK_VERSION }}
195-
path: output/
227+
name: book-fr-html-${{ env.BOOK_VERSION }}
228+
path: output/fra/
229+
230+
- name: Download artifact
231+
uses: actions/download-artifact@v3
232+
with:
233+
name: book-en-html-${{ env.BOOK_VERSION }}
234+
path: output/eng/
196235

197236
- name: Optimize images
198237
run: |
199238
sudo apt-get install -y jpegoptim optipng
200239
find ./output/ -iname '*.jpg' -exec jpegoptim {} \; -o -iname '*.png' -exec optipng {} \;
201240
241+
- name: Copy default index files
242+
run: |
243+
cp ./index.html ./output/
244+
cp -r ./images ./output/
245+
202246
- name: Deploy to GitHub Pages
203247
uses: peaceiris/actions-gh-pages@v3
204248
with:
@@ -209,8 +253,8 @@ jobs:
209253

210254

211255
release:
212-
if: needs.check_version_change.outputs.version_changed == 'true' && (github.ref == 'refs/heads/main')
213-
needs: check_version_change
256+
if: needs.check-version-change.outputs.version_changed == 'true' && (github.ref == 'refs/heads/main')
257+
needs: check-version-change
214258
runs-on: ubuntu-22.04
215259
name: Generate book files for release
216260

@@ -233,10 +277,16 @@ jobs:
233277
exit 1
234278
fi
235279
236-
- name: Download PDF artifact
280+
- name: Download FR PDF artifact
281+
uses: actions/download-artifact@v3
282+
with:
283+
name: book-fr-pdf-${{ env.BOOK_VERSION }}
284+
path: ./
285+
286+
- name: Download EN PDF artifact
237287
uses: actions/download-artifact@v3
238288
with:
239-
name: book-pdf-${{ env.BOOK_VERSION }}
289+
name: book-en-pdf-${{ env.BOOK_VERSION }}
240290
path: ./
241291

242292
- name: Get version

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
./html/*
33
!./html/.gitkeep
44

5+
PREFACE.md
6+
57
*.$*
68
git-story_media/
79

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors:
44
- family-names: "BERWICK"
55
given-names: "Flavien"
66
orcid: "https://orcid.org/0009-0002-4542-0925"
7-
title: "Le DevOps pour transformer les institutions"
8-
version: 1.0.0
9-
date-released: 2023-10-01
7+
title: "Scaling institutions with DevOps"
8+
version: 1.1.0
9+
date-released: 2023-11-12
1010
url: "https://github.com/flavienbwk/book-devops"

README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
</a>
1010
</p>
1111

12+
<h4 align="center">:us:</h4>
13+
<h3 align="center"><a href="./eng/README.md" alt="Access the book in english version">Scaling Institutions with DevOps</a><sup></sup></h3>
14+
<p align="center"><i>The pragmatic decision-makers' guide to understanding and acting.</i></p>
15+
<p align="center" style="color: gray; font-size: 0.9em;">Paperback and ebook with foreword</p>
16+
1217
<p align="center">
1318
<img src="./fra/images/cover_a5_source.png" width="128px"/>
1419
<img src="./fra/images/fourthcover_a5_source.png" width="128px"/>
@@ -19,10 +24,6 @@
1924
<p align="center"><i>Le guide des décideurs pragmatiques pour comprendre et agir.</i></p>
2025
<p align="center" style="color: gray; font-size: 0.9em;">Livre broché et ebook préfacés</p>
2126

22-
<h4 align="center">:uk:</h4>
23-
<h3 align="center">Scaling Institutions with DevOps<sup><a href="#footnote-1">[1]</a></sup></h3>
24-
<p align="center"><i>The pragmatic decision-makers' guide to understanding and acting.</i></p>
25-
2627
<br/>
2728

2829
## What is it ?
@@ -35,11 +36,15 @@ As a DevOps advocate, I had to make this book GitOps-compliant, this is why it i
3536

3637
Here are the different ways to access this writing :
3738

38-
- [Markdown version (FR)](./fra/README.md)
39-
- [HTML version (FR)](https://book-devops.berwick.fr)
40-
- [Ebook version](https://www.amazon.fr/DevOps-pour-transformer-institutions-pragmatiques-ebook/dp/B0CKHV5QB7) (FR)
41-
- [Paperback book](https://www.amazon.fr/DevOps-pour-transformer-institutions-pragmatiques/dp/B0CKJ6SLV3) (FR)
42-
- [Hardcover book](https://www.amazon.fr/DevOps-pour-transformer-institutions-pragmatiques/dp/B0CKJ651K9) (FR)
39+
| Type | French | English |
40+
| ---------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |
41+
| Web version | [Lire maintenant](https://book-devops.berwick.fr/fra/index.html) | [Read now](https://book-devops.berwick.fr/eng/index.html) |
42+
| Markdown version | [Lire maintenant](./fra/README.md) | [Read now](./fra/README.md) |
43+
| Ebook version | [Amazon](https://www.amazon.fr/dp/B0CKHV5QB7) / [Google Books](https://play.google.com/store/books/details?id=3u_bEAAAQBAJ) | _Soon_ |
44+
| Paperback book | [Amazon](https://www.amazon.fr/dp/B0CKJ6SLV3) | _Soon_ |
45+
| Hardcover book | [Amazon](https://www.amazon.fr/dp/B0CKJ651K9) | _Soon_ |
46+
47+
> The original book was written in French. The English version was reworked to include america-related examples and use cases.
4348
4449
## Summary
4550

@@ -62,6 +67,7 @@ _That said, this way of writing is very convenient for not being annoyed by comp
6267
It automatically :
6368

6469
<!-- - [Checks spells](https://github.com/check-spelling/check-spelling/blob/main/.github/workflows/spelling.yml) of english-written texts -->
70+
6571
- [Validates Markdown](https://github.com/marketplace/actions/markdown-linting-action) format
6672
- Renders a PDF version on _develop_ and _main_
6773
- [Updates](./.github/workflows/publish.yml) the Amazon physical version book through their API

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.1
1+
1.1.0-alpha

eng/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
build/
2+
*.log
3+
4+
PREFACE.md

0 commit comments

Comments
 (0)