From cca935495c94347db6e0e7731598810886a078e1 Mon Sep 17 00:00:00 2001 From: Geek-ubaid Date: Mon, 4 May 2020 01:15:30 +0530 Subject: [PATCH 1/7] All content pushed to dev branch --- .gitignore | 2 ++ src/__pycache__/document_parser.cpython-36.pyc | Bin 0 -> 1672 bytes src/__pycache__/line_parser.cpython-36.pyc | Bin 0 -> 2398 bytes src/__pycache__/page_parser.cpython-36.pyc | Bin 0 -> 2663 bytes 4 files changed, 2 insertions(+) create mode 100644 .gitignore create mode 100644 src/__pycache__/document_parser.cpython-36.pyc create mode 100644 src/__pycache__/line_parser.cpython-36.pyc create mode 100644 src/__pycache__/page_parser.cpython-36.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9553f58 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +env/ +.vscode diff --git a/src/__pycache__/document_parser.cpython-36.pyc b/src/__pycache__/document_parser.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fc93b856aea9f2c1846741e1d9014ab3e80b2a2c GIT binary patch literal 1672 zcmZ8hPjA~c6elT4mjA{@i?!XlF2Hut#RE31*kKsrHE9x{@VulzHzJ#$n2aM=mRwRU zl0ZJW*I+yBOYAH0x>LTwPJ554v1AnZ^vFlPzrV+?yWQ5aZ!Ukk3<&v~+!{XcJ21_k zKqQegBLe>{qjM%0Mc&K2ITzgVJoD#)2pmtdhG^^)>C50fk%8iCPlU1|!}mlqRZBMC zF#U%jv$kx>_B9n9)tPl=NA+Y^_O3lj+Y;U8u zRyg5s1qc3dK8I-@0V&ChR-~d8TZ8+RSCN=W0y^j@^0WshY#7IBo|bWJdoK@1d&lv3 z?ay+RUaQ!c$+wlA6(cr}B$%*_BaJ+Dl4i=Xh z3P_qTjdPOr=+(o!-VZhoOwb=3s2HaU;~g*+nPCtRjHGLCLksTbh)&?PV%X;UZ!#z)M_+lO*GGRF;BEkE=7=-@^YaB zM}tvAhak7%Chwvzl_}FaL3?1PJQpoA=HO;T6CA8r>!-O?7oa)SrbKMII@Y9vI(xON z8_hk~Ge`*Sb50*nPM@%k=+&qHE9Tu>qsT{q<;h$Dz*=!UFXS>qz7xl9mq}Jj97yzi zP=3n`#Fa)@H1<5k=^zx+(04l%tOO1e;b8}t6JSaN3_#^ES<@AC(27X_jpQp{GAOja zX217We(BA4<->{KHI(}&azuUxfK&(`coEunOZk~bZo2Ni5)2C6Wv7>EwlR#Gu%L@R94Q9n@mY!Ok6^V4gxZrJAEK7GT3N26c z)aZMtqkS+uKETc#zBMxLdc*;Z@FgDTY0x_mPhTFOeBx05$GOeFG z&oL3vJsZNpVZw6MYuKMtW>|c|& BnuP!W literal 0 HcmV?d00001 diff --git a/src/__pycache__/line_parser.cpython-36.pyc b/src/__pycache__/line_parser.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e08a6dcb0cfc2b4b3eef6b7042b654f6288ea1fb GIT binary patch literal 2398 zcmaJ?UvC>l5Z~R~JFm}wlC*A9N|8$6Tp&Uqpi--fDn)=OQAH80PKDFy_F`XrK0AAt zrjGW6R0jzmA@!MOUib!xM;;NMU?2LzQzSk?9uPC@IB`RSt(}>jot^pZ?#$e~t(O1( zdy{W&o+IQhvhZ_2{t!m70Ynl>GZM@=4XB;7fLZPY+;TT?E%yQsILm575eP~?Ceo37 zpGZDsL0!@Zr0X7lPqNXahQ~>o#WvwHDF(M4pJT1epfj(^@x_AC0_S$^?7(@*WT^JU`WlBg%wkRG; z(y3E1O{Mb+shpB+Iog?0$p=hbmu}_c*FeXQb+@Glx;E%s)Tw*2R>6+a(`-sti4?1( z0&7`^{bT9l+L4ZI)ij3~?$e)2A!%9HbV{e}F8TWV$~%old;dZ6>ltYNJcY*m51M}# z(UksHL%aG2(co1euStcr|&t~Y$pNZ%(I5O%_#{DEWPEjhG z0>+*Ba5B)cd<=O~luTh-J}?LzK7({;#6u#w&>0Sm}BU6nzhz{*h86 zW!z$%rKP$6tHzC#iYCV0N%QiCx`MkpNG>8lm)&!=Fw`o@!FecyB8;-Mmk*P?3}qUZ zLH+YPkHYm&?tJmUES)UH;CK?OK=MXmlFP6Fdnk=85W6EKv$QCU$db)+^aRSR1!iR$ zW%rW2SN5@Xp)0TBQX)B7Bu zQea^`%Ar$4094+DSjAUB2y0@|G7g2yX@^7cQo(%CEz>4tz)@msnPPDRwc0BV+H_#; zq67ApHeszzJG8?%+k5@Y5?@3R<0Ik^IgWK0#Wf(<*`Ws5lu?w~lvwUy_ov4nL2jJ* z$vehNhedz1YiheuT7Cw7tR)jTqf{4gAjrv{9xx5$NX1<1i^NlQ@%SBySp>F3*kUevqQ~} zZFXiZb#}V$j;6WVB|+QKH3D!o;Z%MU4YENIMOFKg&p!VAQS|Wc=h1`vJ9n%0L2{f& zaXRQ{pDzS zavy^6CilcLpIupaZtHwA_jx#um6afWW`8)?|kGyW#qV5YXgl()gk8v1I6q>oZJ?uqk6mi1DW zu5pHesh@Dp4%Z&D=?6wCejxQrgB5<)tiL^GMZ-8JT-6SQ{;6mxpU{l+2z+?K^)=(D z+9oT5>5ZbL>hrND0w-KA8%2A#WCG)u#wObnC%g;}|NWR@-DMS+z;X&W-NsJEX3keZ z>*-8B$=^NYol{<)$&Tq*9?X{RjwZ!%N1esO89i<4as5j2?LdQ^*Zop_6QhD)Yl4Poq zX_8g$L=QkMSI1dDsYEuZyk~h4_YT0Vee9;GTbNk+=bP1U&?0`C>=ol@iLP8)C=Zt| zb`kYrt&c;8HmYBv!EI76(bye~z{(0EAo;-ZbuN}^DLQ>lr0pjwXy@-iFyRP?JF>}_ zc^f~Uuk)+CEd%aQEt=?Yga^3>OOwz3aEa0jydLE^`mUf{aC#LnjXOkEpiJ?M> zZX#2ZZXt*(rDr@Nu7a8K>{du6!D_GqHlJ+ktgIuS)L#ROpo61If|q;79|Eh-`o1(OR_!5{twb5&B#M-(2@FkerRNjZIY##pjm|6TU?V5Fq`B~XA zZA8RP%&g7V++df{v+F-YzcgmC$_swDiii`Yfryg_4)FeZX;xz~620EsGr#JW<>?*T zAJ7o9c8~9uD`#jc*xB+K+R8S0+BeHMDf$<^*v&t2YWYIw_VlXp5!I{ZD&-i}Fsl^5 z81WyBpckdNbFa%S-EGwND23BUF97AnM=1FkL?7&V+AO)jE%*8N;t)AtLF%rk#MXQI zZ46v=YGV3nu$>O_qBkB*Zrw&ZCuEP!ZvG;7^UKk^wVjT8ahl(Pat^V0US9ndKwWwn zi{nZ1g{Dn*1N{!F%FXxVNusYo*RPZKBZ)sjgwEbknpW-+^1(;CL){eX-77W&=^e-@7ty#GNIjmGLICA}F%hevTbx7c^v-k+vyc|@ZN^SJ2=akoQ0zY`$_H~2GhkxwJD+g(Os)=Wz>^*xwbhD!o{ubElZ`d2O@5n6oZcRI3>nx;@jvI6dshGe literal 0 HcmV?d00001 From 3537b72b7f1e7815a2692f486eaf1f873f6d228c Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Mon, 4 May 2020 01:40:46 +0530 Subject: [PATCH 2/7] Add release to pipelines --- .github/workflows/release.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9aaa4f5..fe22631 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,8 @@ name: Release on: push: - branches: [master] + branches: [actions] + tags: '*' jobs: macOS-release: @@ -27,14 +28,17 @@ jobs: FBS_PASS: ${{ secrets.FBS_PASS }} GPG_PASS: ${{ secrets.GPG_PASS }} - - name: Release + - name: Build Installer run: /usr/bin/expect .github/scripts/mac/release.sh - - name: Export setup dmg as .zip artifact - uses: actions/upload-artifact@v1 + - name: Release + uses: ncipollo/release-action@v1 with: - name: macOS dmg - path: target/HandWriter.dmg + artifacts: target/HandWriter.dmg + token: ${{ secrets.GITHUB_TOKEN }} + allowUpdates: true + tag: $VERSION + commit: actions Windows-release: runs-on: [windows-latest] @@ -51,15 +55,18 @@ jobs: pip install -r requirements.txt echo "::set-env name=VERSION::$(type version)" - - name: Release + - name: Build Installer run: | python .\.github\scripts\windows\release.py - - name: Export installer as .zip artifact - uses: actions/upload-artifact@v1 + - name: Release + uses: ncipollo/release-action@v1 with: - name: Windows Installer - path: target/HandWriterSetup.exe + artifacts: target/HandWriter.dmg + token: ${{ secrets.GITHUB_TOKEN }} + allowUpdates: true + tag: $Env:VERSION + commit: actions Debian-release: runs-on: [ubuntu-latest] From ced2246daead8a2add1646b96a138db1f8f5d6e5 Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Mon, 4 May 2020 02:04:48 +0530 Subject: [PATCH 3/7] bugfix: access env variable for release tag in pipelines --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe22631..090c866 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: artifacts: target/HandWriter.dmg token: ${{ secrets.GITHUB_TOKEN }} allowUpdates: true - tag: $VERSION + tag: ${{ env.VERSION }} commit: actions Windows-release: @@ -65,7 +65,7 @@ jobs: artifacts: target/HandWriter.dmg token: ${{ secrets.GITHUB_TOKEN }} allowUpdates: true - tag: $Env:VERSION + tag: ${{ env.VERSION }} commit: actions Debian-release: From 644a0e948e901eebc58615dc481e636559a06ec9 Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Mon, 4 May 2020 23:30:20 +0530 Subject: [PATCH 4/7] Add website build automation and release pipeline --- .github/workflows/release.yml | 75 ++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 090c866..fa2dff3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,6 @@ name: Release on: push: branches: [actions] - tags: '*' jobs: macOS-release: @@ -15,7 +14,7 @@ jobs: with: python-version: "3.6" - - name: Setup release environment + - name: Setup build environment run: | pip install -r requirements.txt brew install expect @@ -31,14 +30,11 @@ jobs: - name: Build Installer run: /usr/bin/expect .github/scripts/mac/release.sh - - name: Release - uses: ncipollo/release-action@v1 + - name: Export setup dmg as .zip artifact + uses: actions/upload-artifact@v1 with: - artifacts: target/HandWriter.dmg - token: ${{ secrets.GITHUB_TOKEN }} - allowUpdates: true - tag: ${{ env.VERSION }} - commit: actions + name: macOS dmg + path: target/HandWriter.dmg Windows-release: runs-on: [windows-latest] @@ -49,24 +45,21 @@ jobs: with: python-version: "3.6" - - name: Setup release environment + - name: Setup build environment run: | pip install pywin32 pip install -r requirements.txt echo "::set-env name=VERSION::$(type version)" - - name: Build Installer + - name: Release run: | python .\.github\scripts\windows\release.py - - name: Release - uses: ncipollo/release-action@v1 + - name: Export installer as .zip artifact + uses: actions/upload-artifact@v1 with: - artifacts: target/HandWriter.dmg - token: ${{ secrets.GITHUB_TOKEN }} - allowUpdates: true - tag: ${{ env.VERSION }} - commit: actions + name: Windows Installer + path: target/HandWriterSetup.exe Debian-release: runs-on: [ubuntu-latest] @@ -160,3 +153,49 @@ jobs: run: | chmod a+x .github/scripts/fedora/release.sh .github/scripts/fedora/release.sh + + Publish: + runs-on: [ubuntu-latest] + needs: [macOS-release, Windows-release] + + steps: + - uses: actions/checkout@v2 + - uses: webfactory/ssh-agent@v0.2.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - uses: actions/download-artifact@v2 + with: + name: macOS dmg + + - uses: actions/download-artifact@v2 + with: + name: Windows Installer + + - name: Setup release environment + run: | + echo "::set-env name=VERSION::$(cat version)" + git config --global user.name ${{ secrets.GIT_USER }} + git config --global user.email ${{ secrets.GIT_EMAIL }} + + - name: Release + uses: ncipollo/release-action@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + allowUpdates: true + tag: ${{ env.VERSION }} + commit: actions + artifacts: [macOS dmg, Windows Installer] + + - name: Modify website pages + run: | + # Cloning the website repo + git clone git@github.com:SaurusXI/HandWriter-webpage.git + cd HandWriter-webpage + sed 's/{VERSION}/'"${{ env.VERSION }}"'/' templates/home.md > content/installer/home.md + + - name: Push changes to website repo + run: | + git add content/installer/ + git commit -m "Automated website build for upstream package update" + git push --force \ No newline at end of file From 29dc8a556cad859f17d050ed7baebb4dedaaab69 Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Mon, 4 May 2020 23:33:15 +0530 Subject: [PATCH 5/7] fix arguments for Publish.release-action in pipelines --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa2dff3..01494c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -185,7 +185,7 @@ jobs: allowUpdates: true tag: ${{ env.VERSION }} commit: actions - artifacts: [macOS dmg, Windows Installer] + artifacts: "macOS dmg, Windows Installer" - name: Modify website pages run: | From 43c708288a46fb8c1dd594c4464b1711e7a43b68 Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Mon, 4 May 2020 23:45:02 +0530 Subject: [PATCH 6/7] bugfix: directory bug in Publish --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01494c6..c44d2de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -196,6 +196,7 @@ jobs: - name: Push changes to website repo run: | + cd HandWriter-webpage git add content/installer/ git commit -m "Automated website build for upstream package update" git push --force \ No newline at end of file From 2ef5b0df3ec85781c18fd63754cdbab977f09943 Mon Sep 17 00:00:00 2001 From: SaurusXI Date: Tue, 5 May 2020 00:14:26 +0530 Subject: [PATCH 7/7] Modify workflow to operate in master branch of GDGVIT repo --- .github/workflows/release.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c44d2de..1ff18c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,9 @@ name: Release on: push: - branches: [actions] + branches: [master] + tags: + - '*' jobs: macOS-release: @@ -184,19 +186,19 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} allowUpdates: true tag: ${{ env.VERSION }} - commit: actions + commit: master artifacts: "macOS dmg, Windows Installer" - name: Modify website pages run: | # Cloning the website repo - git clone git@github.com:SaurusXI/HandWriter-webpage.git - cd HandWriter-webpage + git clone git@github.com:GDGVIT/handwriter-website.git + cd handwriter-website sed 's/{VERSION}/'"${{ env.VERSION }}"'/' templates/home.md > content/installer/home.md - name: Push changes to website repo run: | - cd HandWriter-webpage + cd handwriter-website git add content/installer/ git commit -m "Automated website build for upstream package update" git push --force \ No newline at end of file