From 0bc8d3cfb50f2d0c3e31ed637a962512206de83d Mon Sep 17 00:00:00 2001 From: Amacado Date: Fri, 9 Apr 2021 11:24:03 +0200 Subject: [PATCH 1/4] add paragraph about release strategy, preparation and execution --- CONTRIBUTING.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 153cc06d..86c45f6a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
  • Requesting An Icon
  • Maintainer/Reviewer/Teams
  • Regarding the Build Script
    • +
  • Release strategy, conventions, preparation and execution
    • @@ -299,3 +300,30 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web
  • Comment on the PR so maintainers don't have to manually upload icon result.
  • Publishing a new release to npm; See #288
    • + +

    Release strategy, conventions, preparation and execution

    +
    Release strategy
    +

    Devicon does not follow a strict release plan. A new release is depended on current amount of contributions, required bugfixes/patches and will be discussed by the team of maintainers.

    +

    Generally speaking: A new release will be published when new icons are added or a bug was fixed. When it's predictable that multiple icons are added in a foreseeable amount of time they are usually wrapped together.

    +
    Conventions
    +

    The version naming follows the rules of Semantic Versioning. Given a version number MAJOR.MINOR.PATCH, increment the:

    + +
    Release preparation and execution
    +
      +
    1. Define the next release version number based on the conventions
      2. +
    2. Checkout development as draft-release branch
      3. +
    3. Bump the package version using npm version vMAJOR.MINOR.PATCH -m "bump npm version to vMAJOR.MINOR.PATCH" (see #487)
      4. +
    4. Push the branch draft-release
      5. +
    5. Manually trigger the workflow build_icons.yml (which has a workflow_dispatch event trigger) and select the branch draft-release as target branch. This will build a font version of all icons using icomoon and automatically creates a pull request to merge the build result back into draft-release
      6. +
    6. Review and approve the auto-create pull request created by the action of the step above
      7. +
    7. Create a pull request towards development. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. It's also a good idea to mention and thank all contributions who participated in the release (take description of #504 as an example).
      8. +
    8. Wait for review and approval of the pull request (DON'T perform a squash-merge)
      9. +
    9. Once merged create a pull request with BASE master and HEAD development. Copy the description of the earlier pull request.
      10. +
    10. Since it was already approved in the 'development' stage a maintainer is allowed to merge it (DON'T perform a squash-merge).
      11. +
    11. Create a new release using vMAJOR.MINOR.PATCH as tag and release title. Use the earlier created description as description of the release.
      12. +
    12. Publishing the release will trigger the npm_publish.yml workflow which will execute a npm publish leading to a updated npm package (vMAJOR.MINOR.PATCH).
      13. +
    \ No newline at end of file From 573a8af18e15eae330b8ab10f3058722057afb2b Mon Sep 17 00:00:00 2001 From: Amacado Date: Fri, 9 Apr 2021 11:24:35 +0200 Subject: [PATCH 2/4] rename the branch created by the workflow and set the base branch to the same branch which executed the action --- .github/workflows/build_icons.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_icons.yml b/.github/workflows/build_icons.yml index f4ebb529..82016449 100644 --- a/.github/workflows/build_icons.yml +++ b/.github/workflows/build_icons.yml @@ -65,8 +65,7 @@ jobs: Adios, Build Bot :sunglasses: with: - branch: 'master-build-result' - base: 'master' + branch: 'bot/build-result' commit-message: 'Built new icons, icomoon.json and devicon.css' title: 'bot:build new icons, icomoon.json and devicon.css' body: ${{ format(env.MESSAGE, fromJSON(steps.imgur_step.outputs.imgur_urls)[0] ) }} From d3f41fdcb22f310266794e9d6f0d8a1490270637 Mon Sep 17 00:00:00 2001 From: Amacado Date: Fri, 9 Apr 2021 11:27:56 +0200 Subject: [PATCH 3/4] add hint to release drafting and fix some html errors --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1455458..b86006dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ First of all, thanks for taking the time to contribute! This project can only gr

    Here are some terms that we will use in this repo:

    1. "Technology" is used to describe a software, libraries, tool, etc...
      2. -
    2. "Icon" refers to the svgs and icons version of a technology as a whole. +
    3. "Icon" refers to the svgs and icons version of a technology as a whole.
    4. "SVG/svg" refers to the svg versions of the Icons.
    5. "icon" (lowercase) refers specficially to the font icon versions of the Icons.
    @@ -312,7 +312,7 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web

    Discord server

    We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ. If you don't have a GitHub account but want to suggest ideas or new icons, you can do that here in our Discord channel. -Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub. +Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.

    Release strategy, conventions, preparation and execution

    @@ -335,7 +335,7 @@ We are running a Discord server. You can go here to talk, discuss, and more with
  • Push the branch draft-release
  • Manually trigger the workflow build_icons.yml (which has a workflow_dispatch event trigger) and select the branch draft-release as target branch. This will build a font version of all icons using icomoon and automatically creates a pull request to merge the build result back into draft-release
  • Review and approve the auto-create pull request created by the action of the step above
    • -
  • Create a pull request towards development. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. It's also a good idea to mention and thank all contributions who participated in the release (take description of #504 as an example).
    • +
  • Create a pull request towards development. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. Take the commits as a guideline. It's also a good idea to mention and thank all contributions who participated in the release (take description of #504 as an example).
  • Wait for review and approval of the pull request (DON'T perform a squash-merge)
  • Once merged create a pull request with BASE master and HEAD development. Copy the description of the earlier pull request.
  • Since it was already approved in the 'development' stage a maintainer is allowed to merge it (DON'T perform a squash-merge).
    • From 53f60c7086532e92a1b9d192fd4ff2901f809683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Fri, 9 Apr 2021 19:44:46 +0200 Subject: [PATCH 4/4] new icon: gitter (plain, plain-wordmark) (#556) * new icon: gitter (plain, plain-wordmark) * fix svg error Co-authored-by: David Leal --- devicon.json | 19 +++++++++++++++++++ icons/gitter/gitter-plain-wordmark.svg | 1 + icons/gitter/gitter-plain.svg | 1 + 3 files changed, 21 insertions(+) create mode 100644 icons/gitter/gitter-plain-wordmark.svg create mode 100644 icons/gitter/gitter-plain.svg diff --git a/devicon.json b/devicon.json index 00cd4474..0243f3af 100644 --- a/devicon.json +++ b/devicon.json @@ -1386,6 +1386,25 @@ "color": "#E24329", "aliases": [] }, + { + "name": "gitter", + "tags": [ + "social", + "chat" + ], + "versions": { + "svg": [ + "plain", + "plain-wordmark" + ], + "font": [ + "plain", + "plain-wordmark" + ] + }, + "color": "#000000", + "aliases": [] + }, { "name": "go", "tags": [ diff --git a/icons/gitter/gitter-plain-wordmark.svg b/icons/gitter/gitter-plain-wordmark.svg new file mode 100644 index 00000000..5873f8f5 --- /dev/null +++ b/icons/gitter/gitter-plain-wordmark.svg @@ -0,0 +1 @@ + diff --git a/icons/gitter/gitter-plain.svg b/icons/gitter/gitter-plain.svg new file mode 100644 index 00000000..1523bcde --- /dev/null +++ b/icons/gitter/gitter-plain.svg @@ -0,0 +1 @@ +