From 7ab24fe51c5e2a67f5739def15729efb7e748f92 Mon Sep 17 00:00:00 2001 From: Changkun Ou Date: Thu, 17 Dec 2020 23:45:11 +0100 Subject: [PATCH] github: switch to action from travis (#153) --- .github/workflows/website.yml | 29 +++++++++++++++++++++++++++++ .travis.yml | 18 ------------------ .travis/travis.enc | Bin 1680 -> 0 bytes Makefile | 7 ++++--- docker/Dockerfile | 4 ++-- 5 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/website.yml delete mode 100644 .travis.yml delete mode 100644 .travis/travis.enc diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml new file mode 100644 index 0000000..a9d7187 --- /dev/null +++ b/.github/workflows/website.yml @@ -0,0 +1,29 @@ +name: Website + +on: + push: + branches: [ master ] + +jobs: + + build: + name: Website + runs-on: ubuntu-latest + timeout-minutes: 60 + steps: + - uses: actions/checkout@v2 + - name: build + env: + USER: ${{ secrets.SERVER_USER }} + TARGET: ${{ secrets.SERVER_PATH }} + KEY: ${{ secrets.SERVER_KEY }} + DOMAIN: ${{ secrets.SERVER_DOMAIN }} + run: | + make build + mkdir ~/.ssh + echo "$KEY" | tr -d '\r' > ~/.ssh/id_ed25519 + chmod 400 ~/.ssh/id_ed25519 + eval "$(ssh-agent -s)" + ssh-add ~/.ssh/id_ed25519 + ssh-keyscan -H $DOMAIN >> ~/.ssh/known_hosts + scp -r website/public/modern-cpp/* $USER@$DOMAIN:$TARGET \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ca4819f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -services: - - docker - -before_install: -- openssl aes-256-cbc -K $encrypted_9157553ce13c_key -iv $encrypted_9157553ce13c_iv -in .travis/travis.enc -out ~/.ssh/id_rsa -d -- chmod 600 ~/.ssh/id_rsa -- git config --global user.name "Changkun Ou" -- git config --global user.email "hi@changkun.us" - -addons: - ssh_known_hosts: - - changkun.de - -script: - - make build - -after_success: - scp -r website/public/modern-cpp/* $encrypted_server_user@changkun.de:$encrypted_server_path diff --git a/.travis/travis.enc b/.travis/travis.enc deleted file mode 100644 index 220056d8d4743e40ce56202442fdc461a17709a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25R^RS)5DUQcJMINT z?f^4xH@F+}Kvv)2Gqxaszx$8JZnp6dp+4$M=FuUOi(klhx!#W&HkK%EOR}$P-nq@A z*}dzBpCUuX?PX-tHgr_&9H5^RV zh=}jtvgpVZ#uP+Pc9G%Y*h=E%#8tY-@u6m?Go_bJ`loCuh`oM?r#c!p2TvQMfl|Ff z_DWI)Fpi{d0JBZnX8$-yN;t$Vc8|yKR>q4Lu23%Xw&70Fa#Bi(l{WW~w0x^bD}~N1 zEbveuiB&oc@<`9>Q*JEQ)*v|e7H#lO8q>~il%2jHq4KUY9&w_5O^RrV@OFW8+jjoP zUx?NiSA5mR(>x9r=xniE(2l4q1)jy7E4+Cn5!1((%#f*xA3k6Pk(Gs-e6EnDGE=z9 z1y?Mvlf2+~@t!nPug<=p7wk9xQL4^B!2%x5;e~+=wqQf{mMe~V*RAL9f%MhofKVXu z_}CKzt>Ho@>EL=R;=>U2;F*y)U3|2c*+5>Mh%Jw-#5yE&2otrmQ65!<;`3pQFC37i z{9rN6K#vkseeN9mSjR$A3H5^=9ew0jh<=dZw(@^hN#ETHdBswl9F{w_l$h6kA);C0 zKkqMn(jq_6lwYB}aWojB(}U**Nh9T-=rJcz$RgCsr$*dfe(Q&e*A&oCSWY||D3dNY zEmDzAYp{`W)ZY4Cre=;Bt;+55-BMDW;-A)|cmYYqtP>=sJ^H6Q2-;chc>Iqj?2eJR zv$AQcw)h88N|YeW16_n>IOq-*brpW4bP8)?3?0iQ43Y|=8>B0TJmqq|-Pe&SH%a+F zdf!dl6C;BUTlS_9RYn?_1W^;t9>bn+EMB4Vo}HjT?r*Qm^~vm`Jw-g@jt)5%9t>8p zRHc2(-$~(s`oeT&nsK4W4X|Q0WK8=9Dx#|i?`XQWNbgUlv`OS-Ce7o=GpKMsXWN-nR+=yWrnlxu>2fKTWVwuK8Q4yI39}4;z-1l-jv2AQ zK-2B#3K5s&hr`u3P<9-|MAIBZ%k0b$_doO#%IJ;0y^ETnuHiv7G}b>du*X7^6!tJd z0jjLOXi50L@$(_{qY;dke*XK${E`JJYxEDh-`4U!8E0+l*=Bn452C;17gKlyqrF>g z@~yEDDnH&^kY|&5_&W}SvWCXo&vSvogOW@x0R(B00sHkitj21teoX9CH|Jd7<)&5*NX&B19{Wf)X_wwmY zK>j{!2fxENKJm*~E3aT@-(BRF8e0dH-AdekZ(v)xevw?g{!<<$rxYL*>=aqkXsru) zd9+LBz(Yp}Z_ivN^}B0Alkvk!Lb_N@m4zQWed<+@)OEyRr`xIelF#$)*|2C1GU8bK ze6e&Cbtt*Xc}Vw9fTK=CZfKyAFSV?tbJmGznPZW7b|Y2uEgJ5c?Q{T-Q+n@nGg=u% zaiBP_q^)2@Q*UkZ98Tt(3vd2MnZ)B(M^pe6w!ig>s#FEqLI+c?${hV3 z+w{}d@965j^P49&)EiTNfY~~UjJxE^P3eeii-~lBOE+&bSe~2adLEN%u!aceO33is z2tv{8ke$0H?Q{uCy zf&v_`e(Mi8rxQvwRi-$8X~k^tEk_X?aIIijdj}{)O_Xv!N0fh3Q)Z=tt;noDT1>7r z*NDd!pfDJO0Zx+@58op~Tf+l*jGJ*e!QF@;QH5i{m?e{-{9k;w*zgge9@|jx1eX7y zg4>_AA?zEZbTF0ce{zVv#tBzxx;n1EGrgy6{#yFENzA@Za1+K&Y4LcJ a;%whr_EenC66d{w1lQF(=AWljyr8EKG*PJl diff --git a/Makefile b/Makefile index 6e5b53b..f957a0d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -DOCKER_ENV=changkun/modern-cpp-tutorial:build-env +NAME=modern-cpp-tutorial +DOCKER_ENV=changkun/$(NAME):build-env TARGET = pdf epub LANGS = zh-cn en-us ALL_BUILDS = website $(TARGET) @@ -11,14 +12,14 @@ $(TARGET): $(LANGS) mkdir -p website/public/modern-cpp/$@/ for lang in $^ ; do \ cd $@/$${lang} && make && make clean && cd ../..; \ - mv $@/$${lang}/modern-cpp-tutorial.$@ website/public/modern-cpp/$@/modern-cpp-tutorial-$${lang}.$@; \ + mv $@/$${lang}/$(NAME).$@ website/public/modern-cpp/$@/$(NAME)-$${lang}.$@; \ done website: cd website && make build: - docker run --rm -v `pwd`:/modern-cpp-tutorial -it $(DOCKER_ENV) make + docker run --rm -v `pwd`:/$(NAME) $(DOCKER_ENV) make # dev diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f78b0e..3c61407 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,10 @@ FROM node:latest -LABEL "maintainer"="Changkun Ou " +LABEL "maintainer"="Changkun Ou " LABEL "repository"="https://github.com/changkun/modern-cpp-tutorial" LABEL "homepage"="https://changkun.de/modern-cpp/" -# FUCKING UNICODE +# For Unicode ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8