From 28b062f5d30f170f660488b0bc67541c00d2aa23 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:21:09 +0200 Subject: [PATCH 1/9] Fix missing gradients --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e78075..630c8a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: brew install imagemagick + - run: brew install imagemagick --with-librsvg librsvg --use-rsvg - run: mkdir target - run: convert zarr-gradient.svg target/zarr-gradient.png - env: From 8e75513704dd03f017148300502c1049083cbfd0 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:26:55 +0200 Subject: [PATCH 2/9] Try older version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 630c8a3..7563630 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: brew install imagemagick --with-librsvg librsvg --use-rsvg + - run: brew install https://github.com/Homebrew/homebrew-core/raw/46a2ef7c9f0380b8e19f8dfe37270caa27581353/Formula/imagemagick.rb --with-librsvg - run: mkdir target - run: convert zarr-gradient.svg target/zarr-gradient.png - env: From b3621a779bd6d3cbb7809ce65884ac23652f1cf7 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:37:15 +0200 Subject: [PATCH 3/9] Attempt inkscape on ubuntu --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7563630..0628b78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,21 +7,21 @@ on: jobs: build: - runs-on: macos-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: submodules: true - - run: brew install https://github.com/Homebrew/homebrew-core/raw/46a2ef7c9f0380b8e19f8dfe37270caa27581353/Formula/imagemagick.rb --with-librsvg + - run: sudo apt-get update -y && sudo apt-get install -y inkscape - run: mkdir target - - run: convert zarr-gradient.svg target/zarr-gradient.png + - run: inkscape --export-type=png --export-filename=target/zarr-gradient.png zarr-gradient.svg - env: FILES: zarr-pink-horizontal zarr-pink-stacked run: | for file in $FILES; do - convert -background none ${file}.svg target/${file}-transparent.png - convert -background white ${file}.svg target/${file}-on-white.png - convert -background black ${file}.svg target/${file}-on-black.png + inkscape --export-background-opactity=0 --export-type=png --export-filename=target/${file}-transparent.png ${file}.svg + inkscape --export-background="#ffffff" --export-type=png --export-filename=target/${file}-white.png ${file}.svg + inkscape --export-background="#000000" --export-type=png --export-filename=target/${file}-black.png ${file}.svg done zip -r logos.zip target/ - name: Upload artwork as artifact From e47f5e7fb674d26b9498d7fff74cc07f89087b25 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:40:01 +0200 Subject: [PATCH 4/9] Print help --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0628b78..7f39fc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: submodules: true - run: sudo apt-get update -y && sudo apt-get install -y inkscape - run: mkdir target + - run: inkscape --version + - run: inkscape --help - run: inkscape --export-type=png --export-filename=target/zarr-gradient.png zarr-gradient.svg - env: FILES: zarr-pink-horizontal zarr-pink-stacked From b59e5a8e4bacefa3327dae0ce9c42774485d1aa1 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:42:46 +0200 Subject: [PATCH 5/9] Update for 0.9 version of inkscape --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f39fc2..7986db6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,16 +14,14 @@ jobs: submodules: true - run: sudo apt-get update -y && sudo apt-get install -y inkscape - run: mkdir target - - run: inkscape --version - - run: inkscape --help - - run: inkscape --export-type=png --export-filename=target/zarr-gradient.png zarr-gradient.svg + - run: inkscape --export-png=target/zarr-gradient.png zarr-gradient.svg - env: FILES: zarr-pink-horizontal zarr-pink-stacked run: | for file in $FILES; do - inkscape --export-background-opactity=0 --export-type=png --export-filename=target/${file}-transparent.png ${file}.svg - inkscape --export-background="#ffffff" --export-type=png --export-filename=target/${file}-white.png ${file}.svg - inkscape --export-background="#000000" --export-type=png --export-filename=target/${file}-black.png ${file}.svg + inkscape --export-background-opactity=0 --export-png=target/${file}-transparent.png ${file}.svg + inkscape --export-background="#ffffff" --export-png=target/${file}-white.png ${file}.svg + inkscape --export-background="#000000" --export-png=target/${file}-black.png ${file}.svg done zip -r logos.zip target/ - name: Upload artwork as artifact From 4d316af0e35ff822606ce1c6e9e7d490cb47b5dd Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:45:51 +0200 Subject: [PATCH 6/9] Fix typo --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7986db6..94060ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,9 @@ jobs: FILES: zarr-pink-horizontal zarr-pink-stacked run: | for file in $FILES; do - inkscape --export-background-opactity=0 --export-png=target/${file}-transparent.png ${file}.svg - inkscape --export-background="#ffffff" --export-png=target/${file}-white.png ${file}.svg - inkscape --export-background="#000000" --export-png=target/${file}-black.png ${file}.svg + inkscape --export-background-opacity=0 --export-png=target/${file}-transparent.png ${file}.svg + inkscape --export-background="#ffffff" --export-png=target/${file}-white.png ${file}.svg + inkscape --export-background="#000000" --export-png=target/${file}-black.png ${file}.svg done zip -r logos.zip target/ - name: Upload artwork as artifact From bd43543efed7271172b891333ee3ea9f00ebd6be Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:52:42 +0200 Subject: [PATCH 7/9] Simplify zip of artifacts --- .github/workflows/build.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94060ac..1c7d7ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,22 +13,20 @@ jobs: with: submodules: true - run: sudo apt-get update -y && sudo apt-get install -y inkscape - - run: mkdir target - - run: inkscape --export-png=target/zarr-gradient.png zarr-gradient.svg + - run: inkscape --export-png=zarr-gradient.png zarr-gradient.svg - env: FILES: zarr-pink-horizontal zarr-pink-stacked run: | for file in $FILES; do - inkscape --export-background-opacity=0 --export-png=target/${file}-transparent.png ${file}.svg - inkscape --export-background="#ffffff" --export-png=target/${file}-white.png ${file}.svg - inkscape --export-background="#000000" --export-png=target/${file}-black.png ${file}.svg + inkscape --export-background-opacity=0 --export-png=${file}-transparent.png ${file}.svg + inkscape --export-background="#ffffff" --export-png=${file}-white.png ${file}.svg + inkscape --export-background="#000000" --export-png=${file}-black.png ${file}.svg done - zip -r logos.zip target/ - name: Upload artwork as artifact uses: actions/upload-artifact@v2 with: - name: logos.zip - path: logos.zip + name: pngs + path: *.png release: if: startsWith(github.ref, 'refs/tags') @@ -41,12 +39,11 @@ jobs: - name: Download artwork artifact uses: actions/download-artifact@v2 with: - name: logos.zip + name: pngs path: . - - run: unzip logos.zip - name: Upload website as release asset env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} run: | tagname="${GITHUB_REF#refs/tags/}" - gh release create "$tagname" target/*.png + gh release create "$tagname" *.png From cbc91f19182c9bb74bb9139988294b0f33b84009 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:54:19 +0200 Subject: [PATCH 8/9] Fix YAML syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c7d7ee..99a62d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: pngs - path: *.png + path: "*.png" release: if: startsWith(github.ref, 'refs/tags') From 2b3c27f4c97fd8f4f24cc7a1342e1ebac0f6656b Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 28 Apr 2022 12:57:07 +0200 Subject: [PATCH 9/9] Improve download name --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99a62d8..cbe4f7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Upload artwork as artifact uses: actions/upload-artifact@v2 with: - name: pngs + name: zarr-logo-pngs path: "*.png" release: @@ -39,7 +39,7 @@ jobs: - name: Download artwork artifact uses: actions/download-artifact@v2 with: - name: pngs + name: zarr-logo-pngs path: . - name: Upload website as release asset env: