Skip to content

Commit

Permalink
Release 9 new icons (v11.11.0)
Browse files Browse the repository at this point in the history
# New Icons

- Amazon Cognito (#10716) (@davidlj95)
- Amazon ElastiCache (#10715) (@davidlj95)
- AWS Elastic Load Balancing (#10712) (@davidlj95)
- AWS Secrets Manager (#10717) (@davidlj95)
- Ethers (#10731) (@PeterShaggyNoble)
- JHipster (#10710) (@davidlj95)
- Keycloak (#10688) (@PeterShaggyNoble)
- Redash (#10711) (@davidlj95)
- Syncthing (#10700) (@uncenter)
  • Loading branch information
simple-icons[bot] committed Mar 31, 2024
2 parents 230a99a + e9211be commit dc4d5fb
Show file tree
Hide file tree
Showing 49 changed files with 832 additions and 513 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
separateMajorMinor: false,

// We manually update digest dependencies (eg. hashes in Github actions)
digest: { enabled: false },
digest: {enabled: false},
}
36 changes: 30 additions & 6 deletions .github/workflows/add-labels-priority.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,27 @@ jobs:
runs-on: ubuntu-latest
if: github.event.action == 'opened'
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: simple-icons/labeler@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ steps.app-token.outputs.token }}

assign-to-project:
runs-on: ubuntu-latest
name: Assign to Project
if: github.event.action == 'opened'
needs: triage
env:
MY_GITHUB_TOKEN: ${{ secrets.AUTO_ASSIGN_WORKFLOW_TOKEN }}
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}

- name: Checkout
uses: actions/checkout@v4

Expand All @@ -33,7 +42,7 @@ jobs:
- id: get-si-members
name: Get simple-icons members
run: |
members="$(curl -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --retry 5 -s https://api.github.com/orgs/simple-icons/members | jq .[].login | tr '\n' ',' | sed -e 's/"//g' -e 's/,$//')"
members="$(curl -H 'Authorization: Bearer ${{ steps.app-token.outputs.token }}' --retry 5 -s https://api.github.com/orgs/simple-icons/members | jq .[].login | tr '\n' ',' | sed -e 's/"//g' -e 's/,$//')"
echo "members=$members" >> $GITHUB_OUTPUT
- id: get-linked-issues
Expand All @@ -56,6 +65,8 @@ jobs:
- id: priority-1
name: Assign `update icon/data` pull requests to "Priority 1"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
if: contains(steps.get-labels.outputs.labels, 'update icon/data')
with:
project: https://github.com/orgs/simple-icons/projects/2
Expand All @@ -64,6 +75,8 @@ jobs:
- id: priority-2
name: Assign `new icon` pull requests to "Priority 2"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
# the PR has the `new icon` label along with a linked issue and
# the opener is not a member of simple-icons organization
if: |
Expand All @@ -77,6 +90,8 @@ jobs:
- id: priority-3
name: Assign `new icon` pull requests by maintainers to "Priority 3"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
# the PR has the `new icon` label along with a linked issue and
# the opener is a member of the simple-icons organisation
if: |
Expand All @@ -90,6 +105,8 @@ jobs:
- id: priority-4
name: Assign `new icon` pull requests by maintainers without an issue to "Priority 4"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
# the PR has the `new icon` label but with no linked issue and
# the opener is a member of the simple-icons organisation
if: |
Expand All @@ -102,6 +119,8 @@ jobs:

- name: Assign pull requests to "Unprioritised"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
if: |
steps.priority-1.conclusion == 'skipped' &&
steps.priority-2.conclusion == 'skipped' &&
Expand All @@ -117,11 +136,16 @@ jobs:
if: |
github.event.action != 'opened' &&
github.event.pull_request.merged == false
env:
MY_GITHUB_TOKEN: ${{ secrets.AUTO_ASSIGN_WORKFLOW_TOKEN }}
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Assign closed pull requests to "Completed or Abandoned"
uses: srggrs/assign-one-project-github-action@1.3.1
env:
MY_GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
with:
project: https://github.com/orgs/simple-icons/projects/2
column_name: Completed or Abandoned
10 changes: 9 additions & 1 deletion .github/workflows/autoclose-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,22 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Checkout
uses: actions/checkout@v4
- id: match-java
name: Match Java
env:
ISSUE_TITLE: ${{ github.event.issue.title }}
# if the title contains the word Java (case insensitive)
# we make sure that this word is the end of the string or is followed by a space character (ex. we do not want to match javascript)
# we make sure that this word is the beginning of the string or is preceded by a space character (ex. we do not want to match foojava)
run: |
if [[ "${{ github.event.issue.title }}" =~ (^|[[:space:]])([jJ][aA][vV][aA])([[:space:]]|$) ]]; then
if [[ "$ISSUE_TITLE" =~ (^|[[:space:]])([jJ][aA][vV][aA])([[:space:]]|$) ]]; then
echo "match=true" >> $GITHUB_OUTPUT
fi
Expand All @@ -37,6 +44,7 @@ jobs:
contains(steps.get-labels.outputs.labels, 'new icon')
uses: actions/github-script@v7
with:
github-token: ${{ steps.app-token.outputs.token }}
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,16 @@ jobs:
github.event_name != 'push' &&
needs.release-pr.outputs.did-create-pr == 'true'
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Checkout
uses: actions/checkout@v4
with:
# Ensure the commit can be pushed regardless of branch protections (must belong to an admin of this repo)
token: ${{ secrets.RELEASE_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
# Ensure we are checked out on the develop branch
ref: develop
- name: Use Node.js 20.x
Expand All @@ -54,17 +59,17 @@ jobs:
- name: Install dependencies
run: npm i --ignore-scripts --no-audit --no-fund
- name: Update major version in CDN URLs
run: node ./scripts/release/update-cdn-urls.js
run: ./scripts/release/update-cdn-urls.js
- name: Update SVGs count milestone
run: node ./scripts/release/update-svgs-count.js
run: ./scripts/release/update-svgs-count.js
- name: Update slugs table
run: node ./scripts/release/update-slugs-table.js
run: ./scripts/release/update-slugs-table.js
- name: Update SDK Typescript definitions
run: node ./scripts/release/update-sdk-ts-defs.js
run: ./scripts/release/update-sdk-ts-defs.js
- name: Commit version bump
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: version bump
commit_user_name: 'github-actions[bot]'
commit_user_email: 'github-actions[bot]@users.noreply.github.com'
commit_author: 'github-actions[bot] <github-actions[bot]@users.noreply.github.com>'
commit_user_name: 'simple-icons[bot]'
commit_user_email: 'simple-icons[bot]@users.noreply.github.com'
commit_author: 'simple-icons[bot] <simple-icons[bot]@users.noreply.github.com>'
7 changes: 6 additions & 1 deletion .github/workflows/merge-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'release')
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: simple-icons/release-action@v1
with:
repo-token: ${{ secrets.RELEASE_TOKEN }}
repo-token: ${{ steps.app-token.outputs.token }}
7 changes: 6 additions & 1 deletion .github/workflows/potential-duplicates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: wow-actions/potential-duplicates@v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
label: duplicate
exclude: |
adding
Expand Down
29 changes: 22 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
- name: Install dependencies
run: npm i --ignore-scripts --no-audit --no-fund
- name: Reformat to regular markdown
run: node ./scripts/release/reformat-markdown.js "${{ steps.get-version.outputs.version }}"
run: ./scripts/release/reformat-markdown.js "${{ steps.get-version.outputs.version }}"
- name: Update SDK Typescript definitions
run: node ./scripts/release/update-sdk-ts-defs.js
run: ./scripts/release/update-sdk-ts-defs.js
- name: Build NodeJS package
run: npm run build
- name: Deploy to NPM
Expand All @@ -57,6 +57,11 @@ jobs:
needs: sanity-check
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Checkout
uses: actions/checkout@v4
- name: Get commit message (for release title and body)
Expand All @@ -65,11 +70,11 @@ jobs:
- id: get-version
uses: ./.github/actions/get-version
- name: Reformat to regular markdown
run: node ./scripts/release/reformat-markdown.js "${{ steps.get-version.outputs.version }}"
run: ./scripts/release/reformat-markdown.js "${{ steps.get-version.outputs.version }}"
- name: Configure GIT credentials
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
git config user.name "simple-icons[bot]"
git config user.email "simple-icons[bot]@users.noreply.github.com"
# Commit that will only be included in the tag
- name: Commit CDN theme image links removal
run: |
Expand All @@ -94,20 +99,30 @@ jobs:
needs: npm
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Trigger simple-icons-font release
run: |
curl -X POST \
-H "Authorization: Bearer ${{ secrets.REMOTE_DISPATCH_TOKEN }}" \
-H "Authorization: Bearer ${{ steps.app-token.outputs.token }}" \
-d '{"ref":"develop"}' \
https://api.github.com/repos/simple-icons/simple-icons-font/actions/workflows/auto-release.yml/dispatches
website:
name: Trigger simple-icons-website update
needs: npm
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: Trigger simple-icons-website update
run: |
curl -X POST \
-H "Authorization: Bearer ${{ secrets.REMOTE_DISPATCH_TOKEN }}" \
-H "Authorization: Bearer ${{ steps.app-token.outputs.token }}" \
-d '{"ref":"master"}' \
https://api.github.com/repos/simple-icons/simple-icons-website/actions/workflows/auto-release.yml/dispatches
21 changes: 18 additions & 3 deletions .github/workflows/remove-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ jobs:
if: github.event.pull_request.merged
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: mondeja/remove-labels-gh-action@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
labels: |
assessing
awaiting reply
Expand All @@ -31,9 +36,14 @@ jobs:
if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged)
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: mondeja/remove-labels-gh-action@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
labels: |
in discussion
pending
Expand All @@ -43,9 +53,14 @@ jobs:
if: github.event.issue.state == 'closed'
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- uses: mondeja/remove-labels-gh-action@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
labels: |
in discussion
pending
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ jobs:
- name: Install dependencies
run: npm i --ignore-scripts --no-audit --no-fund
- name: Run linter
run: npm run lint --icons='${{ steps.changes.outputs.icons_files }}'
run: |
sed -i 's/icons\/\*\.svg/$npm_config_icons/' package.json
npm run lint --icons='${{ steps.changes.outputs.icons_files }}'
env:
# Authorise GitHub API requests for editorconfig-checker
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .jsonschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"aka": {
"description": "The brand is also known as (e.g. full length name or abbreviation)",
"type": "array",
"items": { "type": "string" }
"items": {"type": "string"}
},
"dup": {
"description": "Different brands that use the exact same icon",
"type": "array",
"items": { "$ref": "#/definitions/duplicate" }
"items": {"$ref": "#/definitions/duplicate"}
},
"loc": {
"description": "Localized names of the brand",
Expand All @@ -46,7 +46,7 @@
"old": {
"description": "Old names, for backwards compatibility",
"type": "array",
"items": { "type": "string" }
"items": {"type": "string"}
}
},
"minProperties": 1,
Expand Down Expand Up @@ -702,7 +702,7 @@
"icons": {
"description": "A list of brands",
"type": "array",
"items": { "$ref": "#/definitions/brand" }
"items": {"$ref": "#/definitions/brand"}
}
},
"additionalProperties": false,
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package-lock=false
save-exact=true

# Icons to lint with SVGLint (see `npm run svglint`)
# Icons to lint with SVGLint on CI (see `lint` step on verify.yml workflow)
icons=icons/*.svg
9 changes: 0 additions & 9 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,3 @@

# We use our own formatting for the data files.
_data/simple-icons.json

# JavaScript templates are invalid JavaScript so cannot be formatted.
scripts/build/templates/*.js

# Generated JavaScript files don't need to be formatted
index.js
index.mjs
index.d.ts
sdk.js
Loading

0 comments on commit dc4d5fb

Please sign in to comment.