Merge pull request #633 from daiyam/fix-icon

update windows icon
Merge pull request #634 from stripedpajamas/update-build-agents
2026-04-12 00:37:19 +10:00 · 2021-02-07 14:44:14 -08:00 · 2021-02-07 13:57:43 -08:00 · 2021-02-07 13:17:03 -08:00 · 2021-02-07 19:35:57 +01:00 · 2021-02-07 00:09:35 -08:00
3 changed files with 7 additions and 3 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -23,13 +23,13 @@ jobs:
        include:
        - vscode_arch: x64
          npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:x64
+          image: vscodium/vscodium-linux-build-agent:bionic-x64
        - vscode_arch: arm64
          npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:buster-arm64
+          image: vscodium/vscodium-linux-build-agent:stretch-arm64
        - vscode_arch: armhf
          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:buster-armhf
+          image: vscodium/vscodium-linux-build-agent:stretch-armhf

    steps:
      - uses: actions/checkout@v2
--- a/icons/build_icons.sh
+++ b/icons/build_icons.sh
@@ -49,3 +49,7 @@ do
 		fi
 	fi
 done
+
+if [ ! -f "src/resources/win32/code.ico" ]; then
+	convert "src/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "src/resources/win32/code.ico"
+fi
--- a/src/resources/win32/code.ico
+++ b/src/resources/win32/code.ico
Author	SHA1	Message	Date
Peter Squicciarini	f8b17d45a8	Merge pull request #633 from daiyam/fix-icon update windows icon	2021-02-07 14:44:14 -08:00
Peter Squicciarini	f103b1beaa	Merge pull request #634 from stripedpajamas/update-build-agents	2021-02-07 13:57:43 -08:00
Peter Squicciarini	a0eebe5775	(experiment) remove permissions reset	2021-02-07 13:17:03 -08:00
Baptiste Augrain	aec3519ea7	generate win32's icon based on linux' icon	2021-02-07 19:35:57 +01:00
Peter Squicciarini	c9ae0c605f	(experiment) reset permissions before checking out	2021-02-07 00:09:35 -08:00
Peter Squicciarini	5d26e9d7f6	Update Linux build agents	2021-02-06 21:48:11 -08:00