Merge branch 'master' into issue_891

XAMPPRocky · Jun 14, 2024 · a28768a · a28768a
2 parents 44f63cd + 1770db0
commit a28768a
Show file tree

Hide file tree

Showing 45 changed files with 1,920 additions and 489 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,3 @@
+# Format JSON
+d7c548537cd5828b2d58e09f3207ddacc517b227
+f356d27ab21e0f93839da90393c0edf9225740c2
diff --git a/.github/workflows/mean_bean_ci.yml b/.github/workflows/mean_bean_ci.yml
@@ -21,7 +21,7 @@ jobs:
           repo: cross
           matches: ${{ matrix.platform }}
           token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: cross-${{ matrix.platform }}
           path: ${{ steps.cross.outputs.install_path }}
@@ -37,7 +37,7 @@ jobs:
     # artifacts are downloaded first.
     needs: install-cross
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: ci/set_rust_version.bash ${{ matrix.channel }} ${{ matrix.target }}
         shell: bash
       - run: ci/build.bash cargo ${{ matrix.target }}
@@ -63,8 +63,8 @@ jobs:
     runs-on: macos-latest
     needs: install-cross
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: cross-apple-darwin
           path: /usr/local/bin/
@@ -92,9 +92,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: install-cross
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Download Cross
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: cross-linux-musl
           path: /tmp/
@@ -135,8 +135,8 @@ jobs:
           - i686-unknown-linux-musl
           # - mips-unknown-linux-gnu
           # - mips-unknown-linux-musl
-          - mips64-unknown-linux-gnuabi64
-          - mips64el-unknown-linux-gnuabi64
+          # - mips64-unknown-linux-gnuabi64
+          # - mips64el-unknown-linux-gnuabi64
           # - mipsel-unknown-linux-gnu
           # - mipsel-unknown-linux-musl
           - powerpc-unknown-linux-gnu
@@ -145,17 +145,17 @@ jobs:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
           # Android
-          - aarch64-linux-android
-          - arm-linux-androideabi
-          - armv7-linux-androideabi
-          - i686-linux-android
-          - x86_64-linux-android
+          # - aarch64-linux-android
+          # - arm-linux-androideabi
+          # - armv7-linux-androideabi
+          # - i686-linux-android
+          # - x86_64-linux-android
           # *BSD
           # The FreeBSD targets can have issues linking so they are disabled
           # by default.
           # - i686-unknown-freebsd
           # - x86_64-unknown-freebsd
-          - x86_64-unknown-netbsd
+          # - x86_64-unknown-netbsd
           # Solaris
           # - sparcv9-sun-solaris
           # - x86_64-sun-solaris

diff --git a/.github/workflows/mean_bean_deploy.yml b/.github/workflows/mean_bean_deploy.yml
@@ -1,8 +1,9 @@
 on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+  workflow_run:
+    workflows: ["Release-plz"]
+    branches: [main]
+    types: 
+      - completed
 
 name: Mean Bean Deploy
 env:
@@ -23,7 +24,7 @@ jobs:
           repo: cross
           matches: ${{ matrix.platform }}
           token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v3
         with:
           name: cross-${{ matrix.platform }}
           path: ${{ steps.cross.outputs.install_path }}
@@ -44,7 +45,7 @@ jobs:
           # - i686-pc-windows-gnu
           # - x86_64-pc-windows-gnu
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # FIXME: Hack around thinLTO being broken.
       - run: echo "RUSTFLAGS=-Clto=fat" >> $GITHUB_ENV
       - run: bash ci/set_rust_version.bash stable ${{ matrix.target }}
@@ -87,8 +88,8 @@ jobs:
           # - i386-apple-ios
           # - x86_64-apple-ios
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v1
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: cross-apple-darwin
           path: /usr/local/bin/
@@ -162,8 +163,8 @@ jobs:
           # - thumbv7em-none-eabihf
           # - thumbv7m-none-eabi
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v1
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: cross-linux-musl
           path: /tmp/

diff --git a/.github/workflows/publish_image.yaml b/.github/workflows/publish_image.yaml
@@ -0,0 +1,41 @@
+name: Publish Docker Images
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - v*
+
+jobs:
+  image:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+    steps:
+      - uses: earthly/actions-setup@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{raw}}
+            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push Docker Image
+        run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} earthly --ci --push +docker --image_name="{}"
diff --git a/.github/workflows/release-plz.yaml b/.github/workflows/release-plz.yaml
@@ -0,0 +1,28 @@
+name: Release-plz
+
+permissions:
+  pull-requests: write
+  contents: write
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+
+  release-plz:
+    name: Release-plz
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Run release-plz
+        uses: MarcoIeni/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,6 @@ Cargo.lock
 
 # benchmark
 results.csv
+
+node_modules
+*.code-workspace
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,40 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [13.0.0-alpha.1](https://github.com/XAMPPRocky/tokei/compare/v13.0.0-alpha.0...v13.0.0-alpha.1) - 2024-03-04
+
+### Fixed
+- fixed language names not showing when in Light mode (light background ([#1048](https://github.com/XAMPPRocky/tokei/pull/1048))
+
+### Other
+- Create release-plz.yaml
+- Update mean_bean_ci.yml
+- Fix LD Script language data ([#1028](https://github.com/XAMPPRocky/tokei/pull/1028))
+- Fix language data example in CONTRIBUTING.md ([#1029](https://github.com/XAMPPRocky/tokei/pull/1029))
+- Update dependencies
+- Add widget install instructions
+- Update mean_bean_ci.yml
+- Dockerize tokei ([#930](https://github.com/XAMPPRocky/tokei/pull/930))
+- Ignore format commits for `languages.json` ([#1013](https://github.com/XAMPPRocky/tokei/pull/1013))
+- Upgrade GitHub Actions ([#955](https://github.com/XAMPPRocky/tokei/pull/955))
+- add --languages ouput formatter ([#1007](https://github.com/XAMPPRocky/tokei/pull/1007))
+- Add Nuget Config, Bazel and EdgeQL Support, Fix Output Formatter ([#999](https://github.com/XAMPPRocky/tokei/pull/999))
+- show nushell in the readme ([#991](https://github.com/XAMPPRocky/tokei/pull/991))
+- Add support for Redscript ([#994](https://github.com/XAMPPRocky/tokei/pull/994))
+- Add support for jq ([#965](https://github.com/XAMPPRocky/tokei/pull/965))
+- Add support for Astro ([#966](https://github.com/XAMPPRocky/tokei/pull/966))
+- Use XDG conventions on macOS too ([#989](https://github.com/XAMPPRocky/tokei/pull/989))
+- Add JSON5 support for languages.json ([#986](https://github.com/XAMPPRocky/tokei/pull/986))
+- Delete Smalltalk.cs.st ([#990](https://github.com/XAMPPRocky/tokei/pull/990))
+- Add support for smalltalk ([#839](https://github.com/XAMPPRocky/tokei/pull/839))
+- Disable *-android
+- Add HiCAD to languages.json ([#985](https://github.com/XAMPPRocky/tokei/pull/985))
+- Add Nushell to languages.json ([#982](https://github.com/XAMPPRocky/tokei/pull/982))
 # 12.1.0
 
 ## Introduction

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,7 +14,6 @@ properties of a language in `languages.json` through examples.
 "JavaScript": {
       "line_comment": ["//"],
       "multi_line_comments": [["/*", "*/"]],
-      "quotes": [["\\\"", "\\\""]],
       "quotes": [["\\\"", "\\\""], ["'", "'"], ["`", "`"]],
       "extensions": ["js", "mjs"]
 },
@@ -205,12 +204,13 @@ fn foo() {
 Please include the error message and a minimum working example
 including the file or file structure.
 
-```
+````
 This file crashes the program:
 
 <filename>
-\`\`\`
-\`\`\`
 ```
+<file/file structure>
+```
+````
 
 [Rust's enum style]: https://github.com/rust-lang/rfcs/blob/master/text/0430-finalizing-naming-conventions.md#general-naming-conventions