Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/sync-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
permissions:
contents: read
issues: write
uses: ichava/icon-sets-sync/.github/workflows/sync-pack.yml@5fa93a687c120644f75d072a9cdd83833b9f3d80 # main 2026-11-04
uses: ichava/icon-sets-sync/.github/workflows/sync-pack.yml@06b17d7e08b3ff6505e0224610770adf8689dafe # main 2026-11-04
with:
pack: ${{ github.event.repository.name }}
toolkit-ref: 5fa93a687c120644f75d072a9cdd83833b9f3d80
toolkit-ref: 06b17d7e08b3ff6505e0224610770adf8689dafe
refresh-app-client-id: ${{ vars.REFRESH_APP_CLIENT_ID }}
force: ${{ inputs.force == true }}
secrets:
Expand Down
10 changes: 5 additions & 5 deletions ATTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
- **Upstream**: [https://ix.siemens.io](https://ix.siemens.io), source [github.com/siemens/ix-icons](https://github.com/siemens/ix-icons)
- **Author**: Siemens AG
- **Vendored**: npm @siemens/ix-icons 3.7.1; laid out as svg/*.svg, unchanged names
- **Licence**: MIT, `resources/assets/svg/licenses/siemens-ix/LICENSE`, read from LICENSE.md in the npm package on 2026-11-04, SHA-256 `42cb46c894aa9267307aa4985f40f44ba669e54d9b6b487960ecd24e1989213b`
- **Licence**: MIT, `resources/assets/svg/licenses/siemens-ix/LICENSE.md`, read from LICENSE.md in the npm package on 2026-11-04, SHA-256 `42cb46c894aa9267307aa4985f40f44ba669e54d9b6b487960ecd24e1989213b`

```text
MIT License
Expand All @@ -622,7 +622,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
- **Upstream**: [https://garden.zendesk.com](https://garden.zendesk.com), source [github.com/zendeskgarden/svg-icons](https://github.com/zendeskgarden/svg-icons)
- **Author**: Zendesk
- **Vendored**: npm @zendeskgarden/svg-icons 8.4.0; laid out as src/16 and src/12 flattened to <name>-16 / <name>-12
- **Licence**: Apache-2.0, `resources/assets/svg/licenses/garden/LICENSE`, read from LICENSE.md in the npm package on 2026-11-04, SHA-256 `46ae5f0dc2e06a18cde8b06bdb45abea0b6e28d169e6eff2069536780304cf6e`
- **Licence**: Apache-2.0, `resources/assets/svg/licenses/garden/LICENSE.md`, read from LICENSE.md in the npm package on 2026-11-04, SHA-256 `46ae5f0dc2e06a18cde8b06bdb45abea0b6e28d169e6eff2069536780304cf6e`

9.0.0 exists only as a pre-release (next); the stable 8.4.0 is pinned.

Expand Down Expand Up @@ -1552,7 +1552,7 @@ Creative Commons may be contacted at creativecommons.org.
- **Upstream**: [https://game-icons.net](https://game-icons.net), source [github.com/game-icons/icons](https://github.com/game-icons/icons)
- **Author**: Lorc, Delapouite and the game-icons.net contributors
- **Vendored**: commit 82d948812b (master; upstream has no tags); laid out as <contributor>/<name>.svg, one directory per contributor so every icon stays attributable
- **Licence**: CC BY 3.0, `resources/assets/svg/licenses/game-icons/LICENSE`, read from license.txt at commit 82d948812b on 2026-11-04, SHA-256 `fac95252798668fab5ea2cb08338f2ebc6bf894a72b19a15af1ca62f0a6d2e79`
- **Licence**: CC BY 3.0, `resources/assets/svg/licenses/game-icons/license.txt`, read from license.txt at commit 82d948812b on 2026-11-04, SHA-256 `fac95252798668fab5ea2cb08338f2ebc6bf894a72b19a15af1ca62f0a6d2e79`

badges/ (59) and various-artists/ (2) are not vendored: license.txt does not name them, so no licence is stated for them.

Expand Down Expand Up @@ -1957,7 +1957,7 @@ express Statement of Purpose.
- **Upstream**: [https://svgporn.com](https://svgporn.com), source [github.com/gilbarbara/logos](https://github.com/gilbarbara/logos)
- **Author**: Gil Barbara
- **Vendored**: commit 22f03ffc4a (main; upstream has no releases); laid out as logos/*.svg, unchanged names
- **Licence**: CC0-1.0, `resources/assets/svg/licenses/svg-logos/LICENSE`, read from LICENSE.txt at commit 22f03ffc4a on 2026-11-04, SHA-256 `36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673`
- **Licence**: CC0-1.0, `resources/assets/svg/licenses/svg-logos/LICENSE.txt`, read from LICENSE.txt at commit 22f03ffc4a on 2026-11-04, SHA-256 `36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673`

**Trademarks.** Logos in this set depict trademarks of their owners. The licence covers the drawings, not the marks: using a logo is governed by its owner's brand rules, and implies no endorsement.

Expand Down Expand Up @@ -2089,7 +2089,7 @@ For more information, please see

The repository's root LICENSE is OFL-1.1 and covers the fonts; the SVG directory carries its own LICENSE, the Apache 2.0 notice, which is what governs these files. 170 SVGs are not vendored: they declare Adobe Illustrator entities in an internal DTD, which the sanitiser cannot parse, so they cannot be checked.

Apache License 2.0, section 4(a), asks that a copy of the licence go with the files: it is in `resources/assets/svg/licenses/noto-emoji/LICENSE-2.0.txt`. No NOTICE file exists upstream.
Apache License 2.0, section 4(a), asks that a copy of the licence go with the files: it is in `resources/assets/svg/pack-licenses/noto-emoji/LICENSE-2.0.txt`, which the pack supplies; upstream's `2D/svg/` ships only the short notice, and `licenses/noto-emoji/` holds exactly what upstream ships, because icon-sets-sync replaces that directory on every sync. No NOTICE file exists upstream.

```text
Copyright 2013 Google, Inc. All Rights Reserved.
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@ All notable changes to `ichava/icon-sets-extras` follow [Keep a Changelog](https

## [Unreleased]

### Changed

- **Licence files carry upstream's names, so the first sync of each set rewrites nothing** (icon-sets-sync#88). Game Icons' text is `licenses/game-icons/license.txt`, Zendesk Garden's and Siemens iX's are `LICENSE.md`, and SVG Logos' is `LICENSE.txt`, as their upstreams ship them; they had been renamed to `LICENSE`, which a sync would have written back under the upstream name. The bytes, and so the recorded SHA-256s, are unchanged.
- **Radix Icons records `0.0.17` at `upstream.sets.radix-icons.current_version`**, the `website@0.0.17` archive tag the recipe fetches and stamps, instead of `1.3.2`, the version of `packages/radix-icons` inside that tag (still named in `ref`). With `1.3.2` recorded, the sync would have compared the wrong number with upstream's tags and rewritten the field on its first run.
- **Noto Emoji's full Apache-2.0 text moved to `resources/assets/svg/pack-licenses/noto-emoji/LICENSE-2.0.txt`.** Upstream's `2D/svg/` ships only the short notice (`LICENSE`), so the full text the pack added for Apache-2.0 section 4(a) sat in a directory the sync replaces with upstream's files, and the first sync would have deleted it. `ATTRIBUTION.md` points at the new path.
- **`SetLicenceTest` checks each licence directory's exact file list**, upstream's names, and reads each licence through `license.file` in `config.json`.
- **The upstream sync runs icon-sets-sync `06b17d7`** (icon-sets-sync#88), up from `5fa93a6`, which adds this pack's recipe, the `split-variants` and `exclude` transforms, and the `licence_sha256` pin on the upstream licence text. The `uses:` pin and `toolkit-ref` move together; the reusable workflow's inputs did not change between the two commits, so the caller's `with:` block is untouched.

### Added

- **Initial release.** 43,561 SVGs from 20 sets, one directory per set under `resources/assets/svg/files/`: Radix Icons (318), Feather (287), Boxicons (1,634), IconPark (2,658), MingCute (4,526), TDesign Icons (2,358), Siemens iX Icons (1,490), Zendesk Garden Icons (932), coolicons (2,648), Eva Icons (490), Ant Design Icons (848), Health Icons (1,552), Devicon (2,120), Fluent Emoji (4,740), Pepicons (3,825), Game Icons (4,178), CoreUI Icons Free (562), Pinhead (2,747), SVG Logos (2,068), Noto Emoji (3,580). Each set's licence was read at its pinned version and ships in `resources/assets/svg/licenses/<set>/LICENSE`, with its SHA-256 under `upstream.sets.<set>.license` in `resources/assets/svg/config.json`.
- **Initial release.** 43,561 SVGs from 20 sets, one directory per set under `resources/assets/svg/files/`: Radix Icons (318), Feather (287), Boxicons (1,634), IconPark (2,658), MingCute (4,526), TDesign Icons (2,358), Siemens iX Icons (1,490), Zendesk Garden Icons (932), coolicons (2,648), Eva Icons (490), Ant Design Icons (848), Health Icons (1,552), Devicon (2,120), Fluent Emoji (4,740), Pepicons (3,825), Game Icons (4,178), CoreUI Icons Free (562), Pinhead (2,747), SVG Logos (2,068), Noto Emoji (3,580). Each set's licence was read at its pinned version and ships in `resources/assets/svg/licenses/<set>/` under upstream's own file name, with its SHA-256 under `upstream.sets.<set>.license` in `resources/assets/svg/config.json`.
- Every SVG passed `ichava/icon-sets-sync`'s SVG policy (scripts, event handlers, external references and stray text removed). 170 Noto Emoji files that declare Adobe Illustrator entities in an internal DTD cannot be parsed by that policy and are not shipped; they are listed in `config.json`.
- `ATTRIBUTION.md` holds one row per set, the licence texts verbatim, and one row per Game Icons contributor.
- Guards: `IconCountTest` (a count floor per set), `SetLicenceTest` (each licence's hash, the bundle's licence rule, and an attribution row per set), `NoStrayTextNodesTest`, and `SetTest` (one `Set` case per directory).
Expand Down
4 changes: 2 additions & 2 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ pinned, refreshed or removed on its own.
## How a set gets in

Its LICENSE is read at the version being pinned and must be MIT, Apache-2.0, ISC, CC0 or CC BY. The
text ships beside the icons, and its SHA-256 is recorded in `config.json` and in
`SetLicenceTest`, so a licence that changes upstream fails the suite instead of shipping. Every SVG
text ships beside the icons in `resources/assets/svg/licenses/<set>/`, under the file name upstream
gives it, and its SHA-256 is recorded in `config.json` and in `SetLicenceTest`, so a licence that changes upstream fails the suite instead of shipping. Every SVG
then passes icon-sets-sync's SVG policy; a file the policy cannot parse is left out.

## Upstream
Expand Down
14 changes: 7 additions & 7 deletions resources/assets/svg/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
"source_path": "packages/radix-icons/icons",
"_version_note": "archive tag is website@0.0.17; the icons package inside it is 1.3.2"
},
"current_version": "1.3.2",
"current_version": "0.0.17",
"ref": "tag website@0.0.17 (bde33b13aa), packages/radix-icons 1.3.2",
"version_check_url": "https://api.github.com/repos/radix-ui/icons/tags",
"license": {
Expand Down Expand Up @@ -472,7 +472,7 @@
"spdx": "MIT",
"sha256": "42cb46c894aa9267307aa4985f40f44ba669e54d9b6b487960ecd24e1989213b",
"checked_at": "2026-11-04",
"file": "resources/assets/svg/licenses/siemens-ix/LICENSE",
"file": "resources/assets/svg/licenses/siemens-ix/LICENSE.md",
"read_from": "LICENSE.md in the npm package"
},
"attribution_required": false,
Expand All @@ -497,7 +497,7 @@
"spdx": "Apache-2.0",
"sha256": "46ae5f0dc2e06a18cde8b06bdb45abea0b6e28d169e6eff2069536780304cf6e",
"checked_at": "2026-11-04",
"file": "resources/assets/svg/licenses/garden/LICENSE",
"file": "resources/assets/svg/licenses/garden/LICENSE.md",
"read_from": "LICENSE.md in the npm package"
},
"attribution_required": false,
Expand Down Expand Up @@ -708,7 +708,7 @@
"spdx": "CC-BY-3.0",
"sha256": "fac95252798668fab5ea2cb08338f2ebc6bf894a72b19a15af1ca62f0a6d2e79",
"checked_at": "2026-11-04",
"file": "resources/assets/svg/licenses/game-icons/LICENSE",
"file": "resources/assets/svg/licenses/game-icons/license.txt",
"read_from": "license.txt at commit 82d948812b"
},
"attribution_required": true,
Expand Down Expand Up @@ -788,7 +788,7 @@
"spdx": "CC0-1.0",
"sha256": "36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673",
"checked_at": "2026-11-04",
"file": "resources/assets/svg/licenses/svg-logos/LICENSE",
"file": "resources/assets/svg/licenses/svg-logos/LICENSE.txt",
"read_from": "LICENSE.txt at commit 22f03ffc4a"
},
"attribution_required": false,
Expand Down Expand Up @@ -1008,8 +1008,8 @@
},
"update_command": {
"type": "recipe",
"recipe": "manifest-pack",
"_note": "icon-sets-sync has no config for this pack yet. Its manifest-pack recipe refreshes npm-sourced sets only; the github-archive sets (radix-icons, iconpark, mingcute, coolicons, fluent-emoji, game-icons, svg-logos, noto-emoji) need it extended."
"recipe": "icon-sets-extras.<set>",
"_note": "Each set has its own icon-sets-sync recipe, icon-sets-extras.<set> (icon-sets-sync#88), which refreshes files/<set>/ and licenses/<set>/ and stamps upstream.sets.<set>.current_version."
}
},
"license": {
Expand Down
66 changes: 64 additions & 2 deletions tests/Unit/SetLicenceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function extras_root(): string
return dirname(__DIR__, 2);
}

/** @return array<string, string> set => SHA-256 of its LICENSE, read 2026-11-04 */
/** @return array<string, string> set => SHA-256 of its licence file, read 2026-11-04 */
function extras_licence_hashes(): array
{
return [
Expand All @@ -39,6 +39,44 @@ function extras_licence_hashes(): array
];
}

/**
* The exact files in each licenses/<set>/ directory. icon-sets-sync's licence sink
* deletes that directory and writes upstream's licence files back under their
* upstream names on every real sync, so anything else there would be lost and a
* renamed file would be written back under upstream's name. The three sets whose npm package
* ships no licence (ant-design, eva, pepicons) are not covered yet: the sink deletes
* their directory on a real sync unless it holds a SOURCE.md, and that marker is
* still to be added. Names here are what a dry run of each
* set's recipe reports as would_write (icon-sets-sync 06b17d7, 2026-11-04).
*
* @return array<string, list<string>>
*/
function extras_licence_files(): array
{
return [
'radix-icons' => ['LICENSE'],
'feather' => ['LICENSE'],
'boxicons' => ['LICENSE'],
'iconpark' => ['LICENSE'],
'mingcute' => ['LICENSE'],
'tdesign' => ['LICENSE'],
'siemens-ix' => ['LICENSE.md'],
'garden' => ['LICENSE.md'],
'coolicons' => ['LICENSE'],
'eva' => ['LICENSE'],
'ant-design' => ['LICENSE'],
'health-icons' => ['LICENSE'],
'devicon' => ['LICENSE'],
'fluent-emoji' => ['LICENSE'],
'pepicons' => ['LICENSE'],
'game-icons' => ['license.txt'],
'coreui' => ['LICENSE'],
'pinhead' => ['LICENSE'],
'svg-logos' => ['LICENSE.txt'],
'noto-emoji' => ['LICENSE'],
];
}

/** @return array<string, mixed> */
function extras_config(): array
{
Expand All @@ -49,7 +87,9 @@ function extras_config(): array
expect(extras_licence_hashes())->toHaveCount(20);

foreach (extras_licence_hashes() as $set => $hash) {
$file = extras_root() . "/resources/assets/svg/licenses/{$set}/LICENSE";
$relative = extras_config()['upstream']['sets'][$set]['license']['file'];
expect($relative)->toStartWith("resources/assets/svg/licenses/{$set}/");
$file = extras_root() . '/' . $relative;
expect(is_file($file))->toBeTrue("missing licence for {$set}");
expect(hash_file('sha256', $file))->toBe($hash, "the {$set} licence changed; read it before shipping");
expect(extras_config()['upstream']['sets'][$set]['license']['sha256'])->toBe($hash);
Expand Down Expand Up @@ -77,3 +117,25 @@ function extras_config(): array
}
}
});

it(description: 'keeps exactly the files a sync writes in each licence directory', closure: function () {
expect(extras_licence_files())->toHaveCount(20)
->and(array_keys(extras_licence_files()))->toEqualCanonicalizing(array_keys(extras_licence_hashes()));

foreach (extras_licence_files() as $set => $expected) {
$dir = extras_root() . "/resources/assets/svg/licenses/{$set}";
$files = array_values(array_diff(scandir($dir) ?: [], ['.', '..']));
sort($files);

expect($files)->toBe($expected, "licenses/{$set}/ holds a file a sync would delete or rename");
expect(basename(extras_config()['upstream']['sets'][$set]['license']['file']))->toBeIn($expected);
}
});

it(description: 'ships the full Apache-2.0 text for Noto Emoji outside the directory the sync replaces', closure: function () {
$file = extras_root() . '/resources/assets/svg/pack-licenses/noto-emoji/LICENSE-2.0.txt';

expect(is_file($file))->toBeTrue()
->and((string) file_get_contents($file))->toContain('Version 2.0, January 2004');
$this->assertStringContainsString('resources/assets/svg/pack-licenses/noto-emoji/LICENSE-2.0.txt', (string) file_get_contents(extras_root() . '/ATTRIBUTION.md'));
});
Loading