From 583ab8c6368da100465ef1193a25db66d2d75eaa Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.studio>
Date: Thu, 9 Jul 2020 00:19:19 -0300
Subject: [PATCH] feat(action) add iconPath input

---
 .github/workflows/test-action.yml |   1 +
 README.md                         |   1 +
 action.yml                        |   2 ++
 example/icon.png                  | Bin 0 -> 3767 bytes
 src/main.ts                       |  18 +++++++++++++++---
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 example/icon.png

diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
index caa5b5c..14de1a5 100644
--- a/.github/workflows/test-action.yml
+++ b/.github/workflows/test-action.yml
@@ -40,6 +40,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with: 
         projectPath: ./example
+        iconPath: ./icon.png
         tagName: example-v__VERSION__
         releaseName: "Release example app v__VERSION__"
         releaseBody: "See the assets to download this version and install."
diff --git a/README.md b/README.md
index 473baa8..bde5c50 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ jobs:
 | `releaseDraft`     |  false   | Whether the release to create is a draft or not                                             | bool   | false                 |
 | `prerelease`       |  false   | Whether the release to create is a prerelease or not                                        | bool   | false                 |
 | `releaseCommitish` |  false   | Any branch or commit SHA the Git tag is created from, unused if the Git tag already exists  | string | SHA of current commit |
+| `iconPath`         |  false   | path to the PNG icon to use as app icon, relative to the projectPath                        | string |                       |
 
 ## Outputs
 
diff --git a/action.yml b/action.yml
index 213720c..3a84e98 100644
--- a/action.yml
+++ b/action.yml
@@ -24,6 +24,8 @@ inputs:
     default: 'tauri.conf.json'
   distPath:
     description: 'path to the distributable folder with your index.html and JS/CSS'
+  iconPath:
+    description: 'path to the PNG icon to use as app icon, relative to the projectPath'
 outputs:
   releaseId:
     description: 'The ID of the created release'
diff --git a/example/icon.png b/example/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f44bd7762a96d2871cc89741c37735db41f8390
GIT binary patch
literal 3767
zcmeHJdpK148rIRy?t->zI8DZ5(?vB@Ta;@^HOi$6ikOxf8++U~#$}jM4JsS8<(8PE
zk{FlC)FNX{XWY_+5OZs0gxtnZ7&2zeVeI}t|LnicS<mx(*0+Ao`o8r&@B4o5Z{2ot
zIjO#3`vw&i6?Md^<L6XV*0NXDTGizp+uUDWmv2zFGZ!2aRT32nMHRA&XiF5*g;T<*
zPGTn=PtVZH$QVc*U4CtS*r`hqDk>UHD{D>GJ`Lz{V2?O%cOmAXnBR_tp43$f+X-IP
zqnd_bBlm1gKMUJn{q}v%z8m1I&U~QJ$xXp}>4)@9@n(G!%y;E4DAjFy!wWk{-g^~x
zg_?KbtSO;h?f%Oj`v3JeBJkSTs%)JVE=m*`N&6NZ@*cl%hn1sCTLVz_`sT;3ks6uP
z>j>fl<x|+63QdzX=w^^aZkTeZv8gu<J;pX}loo!Ev#a8hIPH8*o*jjeI_7aJXK*q_
zyd0-*_Qi_G*73djx*{lKK6O%_WI&+yPo@ORO}>#<L$R!Geo+)Vi>^C7P+U6$SY8@I
zzl<b=seN1^>!#pe7aI^P`#Vy^dv-uCAGNPlos4G>vkHV7q2Yutb<`PvT01FgJ&<Q%
zAH(NM$Vr1YOC$=&`O2*dIu!;E4hOZqG9a*o3T<$=FuuCn#dfJR=rpfQ4S4|>&+?I2
ze8XKzSdwI?v(!ss8~xcDIN1{mzH}1vtGMgRF>}#WchlNCz{VWi9{D6Qt~*G!SWmkf
zC#_+RJi;;U_%U%Fin$V0%)*y&ZdKiqFuW%WvJXuV*R=a}yQIZN=+rd?xTD~WlGDy-
zo>^7HDPg_X6F%RT@_lO*4y;lQ9s=5wLXwzFd2*Ofg%XJEMKIP{w0E{~ju~Q9f}g7T
z<ak6Uc*(d!3g?M(9^|?mMT^1>&`j=G=^>_<R+|Mn$EUFluT3kHMs!y>EjH`SG3JQZ
zj7sGBXZz@v-#vh)K?0d!@^f3Z>`j4B;96r%(S`nDV=YOTn=cFO*)T&mYaynv{&F+U
zot9{rWd{Qn-OHkf%}fg`@Lo^1y<KTMU`R#(k5jJs+G>H%%t8p>rt11=ZA2rMl4+WY
z|3hAOEwXfAe{Kp~)NM--XE)DRkBdjuStf@M7TqKJ6yxVRMWbug+>w^U<&D|t+gYDA
z)uisRS(u}j*wyEt`>?%Hv~fRkFZzcj!U+cCX(<LqJJpgn;w~I36Gd5cdcly_Os>+)
zJc|R{7#I$+qbE{sO#K((SV^m<64!tUD_-o!Wc`?6p@l87LE$$y&{iXvvk-Z?<giQ>
z(_IrB&7x1DFGOw1ZVA8;UQLpiz?LGSrtN%+@_-)lVJsTC6c;u9#Md8WffItLyIXZi
zkwJd;SAmVH$E-1g+v6lD>yzQB=!QY_PrZ+DU7N1rH<;9g8yQY49pY3v)1~itu7T;@
zWNTOL3q)0f#wpD|zZjF^&307&RVJTOc(OC|lgO^&I-|>;V(uB*wrjr_=9$?w0+n;0
z#q0Q%Gdcs=_Ei&+2#X)BZ-sJ?*y|{hRf&~%7N`N{%<w;p;_jznPXX0f%UA~%rZCHr
zJvvW$T5NNrLYPIUuu<_vF$0C&<t>dvBc_K|kugQ{Z-0!nD4SJlnyLM2-0jvkb?0VR
z-B<n-q}9mXO>qb|BSi5tlHVgk<>xK^#83)lySle|MlxN2!I#pU?q?$$X5D$4tG7o}
zh7X=BLO#5$IdCPD5Nv(<Wy-7HG^>O32ZQfU{aR|=yFz#u`DKp!H0^~TF;kGuZ>RqI
zW<8hoZTykvVD)cK3`|$5UBn`{&yy+Byi$uRy}dpyMNBTd217wdIh}af(0-$cDs#UI
zZnD6)?`&x5?vvT!#C_{|)#C+O7e@vv<{WK0BtQRhc||HMjgaJw6v?afUbj5Kl@Iwz
zgG=uL7#Mlv_Iz-Y-&koHw|?B`c-qdmd;e4dIS7!bvbz~>2{dxEyhtGDYEF}je{did
z4mYQpYvJyD;O}RR>gsP&>Q<KlsX`mCW6m-l(FN1|G8|jr<kV#J3uI$z2P87L@?)%7
z&|LcF<du<p&qnY$`vsJHFvu`2x-bR4tKU#BBo6R?;@H9av5Bl3T+XjMhMjz@J#@+D
zo5o-D`_gc#H76d*%4{O?3Gk5G&9^9%C=)bil8wsm)&WW4!H}8cxklrPcu%wvDX|tf
z=klh+n_DO!=b8Nj!5+AOLBksz;IVV)XmW6aHJT(<m%Hxj%mmM^Ognccy8Y&HbKCHx
zp?s9qb#DTk+J+T$+;|LNt)L;|6Xl<z#k+RBIL{uh;3|4D^eXG3*dBqj$)>PPyw{(Y
zm&(cd)I%U`g(LA+a4`PeGkFa?FOv+f^ZiUl{SdkXtO(|-99B|+*}wy*+&FKzTLJ3+
zB=J%oID6BaF&D=%LQCubvozR#WGq{w#=O%1sw7FgZDqUT66OJ%*l)A=Wg8*5zy3`R
z=VAhYb;PXag@^vqF|FxYfSa$y{{VDF)!VU$dt15!zTR&-rp1ehUln!^xjnx<7o9#y
zK@jotOHv8E5ga%1Kh0j}K>i2=L4{Ju%OLPQe4^-OofcNII&1GJCK<Jxy3S=>!#NbH
zSMs2@wPZ|9v*tVHdd1`byt^=LcCt(qF@*tA)hR<BFJ-^?zUL<Oju)h_$E#+vj;~Oz
z0c@m<wz^xq`7kf6^dpjZNpR-d*q7m~R$34*DYf>^k~#)(C#EZB;w!n=JfZ&LQ{LPj
z=!id*2*2h0nOwYcpkjEzN6$g{DC!le-9a&Qe%0aM$FN}^u>6@w?LdK^JB)9P9{aFu
z>TMdpGjj*Cz2`>KGrvZEpPjSThl_dPGd?2@1|CPzV?SMyy$;{xt=Mw@wm?4I*6p&|
zZ2)^*TocqWVRoL23cXNjTjHjO&m<S0ZW#Yvs}XZf0x`9e%Bb_m7g=T{4cB(2C{-Q6
zW;hl}0<V*<-5*O4f5`?!Lg_`;nU2Q~J-sV06E1&bZrt78rlt-m(d#1nfcYi~G6qU^
z5L4&O9@v_9CKbVkNm{DHUQD~Ns-J^x-|b~1Z%&Ol3q~ebi_C!3R2=MT7D2oR@y*M;
zBl#sK9+EJ9c3i1WQwTVe*ABoch@=BZMJ_(bn5XX*>1+UqDr@?7UxY<7-xc22niDA)
z9x$x*+`GVAwalvk^%ivTNV*!3QfgU9A|8#Rl3)IsJkqu~+vd=3d6*#Bj-^_kJa}vA
z!6U0`GDLHFb`4s237z`ldrrvrye=#7426KhMb{-2x$U^~+rhhpImSi4r~vE)UHh8~
z>XrS?KHKh=ah}ujq_R%C-MN~s2*7mP483r2^@G<*9|NQYS-{+cwj{%uZi;SC;z(2x
z!~~>bhyQe}`Hjy57OPfpk6cg!{rR86**t+(XXtX`Adt#UL}`ZE2pe)!gBDAl#}E!E
z$LuY@^zWJt?3nSLvTZ)YH$)Tt9l6mcV9_-cA*mb~<_Jz${dH=5CO0Dj`)Hd|5^15k
zV`{xT#@aqO&S&4-_;swdH_1ZLowoEIa);mPx&JwOan<sEXIEb`UGyNt@3Ii_>6B5y
zAuTZS<G4%M5Fq+ohs%vnd@boh@eV0lxdSi@IrWf{u8D|9{As#;-~@2GrDF14zud%W
z@qo_<OVSrAsUH0Z`iD|XZU@mb5>4bz+Mv~g$<uNmTVNeaAx9NCV_r*<YZe?XUsy~i
z2Cn!7FRJN+%}Q5YPGL$k#}<;}U_MDiUg$$>IZNs;YpKpps*sasraZ%qpvaI#JL)-n
zAQnz4(ya(7(_1$B0ZHT+xs>{%28WtA=DG<Km{{pp)k(;<25^yb&)1SgZ+jHGWyql4
zSL8|y@HJ<&2!4cO4bT&5<mdnO!@9rmr~H4mbXA37%?Gj$EsXuJZ3P5`qs#G1`zts8
E1G}e+egFUf

literal 0
HcmV?d00001

diff --git a/src/main.ts b/src/main.ts
index e26b30c..a134c38 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -48,7 +48,13 @@ interface Application {
   version: string
 }
 
-async function buildProject(root: string, debug: boolean, { configPath, distPath }: { configPath: string | null, distPath: string | null }): Promise<string[]> {
+interface BuildOptions {
+  configPath: string | null
+  distPath: string | null
+  iconPath: string | null
+}
+
+async function buildProject(root: string, debug: boolean, { configPath, distPath, iconPath }: BuildOptions): Promise<string[]> {
   return new Promise<string>((resolve) => {
     if (hasTauriDependency(root)) {
       const runner = usesYarn(root) ? 'yarn tauri' : 'npx tauri'
@@ -76,11 +82,16 @@ async function buildProject(root: string, debug: boolean, { configPath, distPath
           cargoManifest.package.version = version
           writeFileSync(manifestPath, toml.stringify(cargoManifest as any))
 
-          return {
+          const app = {
             runner,
             name: appName,
             version
           }
+          if (iconPath) {
+            return execCommand(`${runner} icon --icon ${join(root, iconPath)}`, { cwd: root }).then(() => app)
+          }
+
+          return app
         })
       }
     })
@@ -126,6 +137,7 @@ async function run(): Promise<void> {
     const projectPath = resolve(process.cwd(), core.getInput('projectPath') || process.argv[2])
     const configPath = join(projectPath, core.getInput('configPath') || 'tauri.conf.json')
     const distPath = core.getInput('distPath')
+    const iconPath = core.getInput('iconPath')
 
     let tagName = core.getInput('tagName').replace('refs/tags/', '');
     let releaseName = core.getInput('releaseName').replace('refs/tags/', '');
@@ -138,7 +150,7 @@ async function run(): Promise<void> {
       throw new Error('`tag` is required along with `releaseName` when creating a release.')
     }
 
-    const artifacts = await buildProject(projectPath, false, { configPath: existsSync(configPath) ? configPath : null, distPath })
+    const artifacts = await buildProject(projectPath, false, { configPath: existsSync(configPath) ? configPath : null, distPath, iconPath })
 
     let uploadUrl: string
     if (tagName) {