From c6de16260d0278448bc78731b0ca2e7653ba9d7d Mon Sep 17 00:00:00 2001 From: kellervater Date: Sat, 12 Apr 2025 14:03:28 +0200 Subject: [PATCH] refactor: we obviously don't need this fluff --- .github/workflows/lint.yml | 30 -------- .pre-commit-config.yaml | 17 ---- .tool-versions | 3 - Gemfile | 7 -- Gemfile.lock | 154 ------------------------------------- Makefile | 23 ------ README.md | 48 ------------ install-asdf.sh | 56 -------------- page/Makefile | 28 ------- renovate.json5 | 62 --------------- 10 files changed, 428 deletions(-) delete mode 100644 .github/workflows/lint.yml delete mode 100644 .tool-versions delete mode 100644 Gemfile delete mode 100644 Gemfile.lock delete mode 100644 Makefile delete mode 100755 install-asdf.sh delete mode 100644 page/Makefile delete mode 100644 renovate.json5 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 1de46f4..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: Basic Linting - -on: - pull_request: - branches: ["**"] - push: - branches: [main] - -jobs: - lint: - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - uses: actions/checkout@v4 - # - uses: asdf-vm/actions/setup@v3 - # - name: Install tooling required for pre-commit - # run: | - # for tool in actionlint shellcheck terraform terraform-docs tflint ; do - # asdf plugin add "${tool}" - # asdf install "${tool}" - # done - # moving actionlint to centralized composite action - - uses: camunda/infra-global-github-actions/actionlint@main - with: - version: '1.7.4' - - - uses: pre-commit/action@v3.0.1 - with: - extra_args: --all-files --verbose diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa8f85a..3693617 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,23 +8,6 @@ repos: - id: check-added-large-files args: - --maxkb=1000 -- repo: https://github.com/detailyang/pre-commit-shell - rev: v1.0.6 - hooks: - - id: shell-lint - args: [--external-sources] -- repo: https://github.com/rhysd/actionlint - rev: v1.7.7 - hooks: - - id: actionlint -- repo: https://github.com/psf/black - rev: 25.1.0 - hooks: - - id: black - args: - [ - "--line-length=121" - ] - repo: https://github.com/renovatebot/pre-commit-hooks rev: 39.227.1 hooks: diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 39d52fd..0000000 --- a/.tool-versions +++ /dev/null @@ -1,3 +0,0 @@ -pre-commit 4.2.0 -ruby 3.3.7 -shellcheck 0.9.0 diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 82aab5c..0000000 --- a/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -# gem "rails" - -gem "jekyll" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 25e1926..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,154 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - base64 (0.2.0) - bigdecimal (3.1.9) - colorator (1.1.0) - concurrent-ruby (1.3.5) - csv (3.3.3) - em-websocket (0.5.3) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0) - eventmachine (1.2.7) - ffi (1.17.1) - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86-linux-gnu) - ffi (1.17.1-x86-linux-musl) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) - forwardable-extended (2.6.0) - google-protobuf (4.30.2) - bigdecimal - rake (>= 13) - google-protobuf (4.30.2-aarch64-linux) - bigdecimal - rake (>= 13) - google-protobuf (4.30.2-arm64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.30.2-x86-linux) - bigdecimal - rake (>= 13) - google-protobuf (4.30.2-x86_64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.30.2-x86_64-linux) - bigdecimal - rake (>= 13) - http_parser.rb (0.8.0) - i18n (1.14.7) - concurrent-ruby (~> 1.0) - jekyll (4.4.1) - addressable (~> 2.4) - base64 (~> 0.2) - colorator (~> 1.0) - csv (~> 3.0) - em-websocket (~> 0.5) - i18n (~> 1.0) - jekyll-sass-converter (>= 2.0, < 4.0) - jekyll-watch (~> 2.0) - json (~> 2.6) - kramdown (~> 2.3, >= 2.3.1) - kramdown-parser-gfm (~> 1.0) - liquid (~> 4.0) - mercenary (~> 0.3, >= 0.3.6) - pathutil (~> 0.9) - rouge (>= 3.0, < 5.0) - safe_yaml (~> 1.0) - terminal-table (>= 1.8, < 4.0) - webrick (~> 1.7) - jekyll-sass-converter (3.1.0) - sass-embedded (~> 1.75) - jekyll-watch (2.2.1) - listen (~> 3.0) - json (2.10.2) - kramdown (2.5.1) - rexml (>= 3.3.9) - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - liquid (4.0.4) - listen (3.9.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.4.0) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (6.0.1) - rake (13.2.1) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) - ffi (~> 1.0) - rexml (3.4.1) - rouge (4.5.1) - safe_yaml (1.0.5) - sass-embedded (1.86.3) - google-protobuf (~> 4.30) - rake (>= 13) - sass-embedded (1.86.3-aarch64-linux-android) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-aarch64-linux-gnu) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-aarch64-linux-musl) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-arm-linux-androideabi) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-arm-linux-gnueabihf) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-arm-linux-musleabihf) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-arm64-darwin) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-riscv64-linux-android) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-riscv64-linux-gnu) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-riscv64-linux-musl) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-x86_64-darwin) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-x86_64-linux-android) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-x86_64-linux-gnu) - google-protobuf (~> 4.30) - sass-embedded (1.86.3-x86_64-linux-musl) - google-protobuf (~> 4.30) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.6.0) - webrick (1.9.1) - -PLATFORMS - aarch64-linux - aarch64-linux-android - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-androideabi - arm-linux-gnu - arm-linux-gnueabihf - arm-linux-musl - arm-linux-musleabihf - arm64-darwin - riscv64-linux-android - riscv64-linux-gnu - riscv64-linux-musl - ruby - x86-linux - x86-linux-gnu - x86-linux-musl - x86_64-darwin - x86_64-linux-android - x86_64-linux-gnu - x86_64-linux-musl - -DEPENDENCIES - jekyll - -BUNDLED WITH - 2.6.7 diff --git a/Makefile b/Makefile deleted file mode 100644 index 33d66c3..0000000 --- a/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -.PHONY: help - -help: - @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) - -.DEFAULT_GOAL := help - -.PHONY: asdf-plugins -asdf-plugins: ## Install asdf plugins - # - # Add plugins from .tool-versions file within the repo. - @# If the plugin is already installed asdf exits with 2, so grep is used to handle that. - @for plugin in $$(awk '{print $$1}' .tool-versions); do \ - asdf plugin add $${plugin} 2>&1 | (grep "already added" && exit 0); \ - done - # Update all plugins to their latest version - @asdf plugin update --all - -.PHONY: asdf-install -asdf-install: asdf-plugins ## Install tools with asdf - # - # Install tools via asdf. - @asdf install diff --git a/README.md b/README.md index 2dd37d6..02066ee 100644 --- a/README.md +++ b/README.md @@ -8,54 +8,6 @@ This repo contains the respective `scad` files for all fully customizable models You can find all parametric and non-parametric models as well as the `f3d` files (like the `HomeRacker - Core`) on [Makerworld](https://makerworld.com/en/@kellervater)). -# :woman_technologist: Development ->[!NOTE] -> Everything Jekyll-related has been tested using debian-based distros (in my case Ubuntu and WSL2 Ubuntu). - -## :toolbox: Prerequisites -### :pushpin: System Dependencies -Install following system dependencies for debian-based OSs: -```bash -# required for asdf utilities in this repo -sudo apt install make -# required ruby dependencies -sudo apt install autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev -``` -### :robot: asdf -You need to install [asdf](https://asdf-vm.com/guide/getting-started.html). You can do so by running the install script: -```bash -chmod +x install-asdf.sh && ./install-asdf.sh -``` -This will add `asdf` and bash completion to your path. - -### :electric_plug: Plugins -Now you can install all plugins: -```bash -make asdf-install # due to some bug you might need to run it twice before it works -``` -> [!NOTE] -> Since renovate is activated on this repository, this step might be reocurring due to regular udpates to plugin versions. - -### Install Gems -Now you finally can install Jekyll: -```shell -# Install Jekyll globally -gem install jekyll bundler -# Install jekyll for the project -bundle -``` - -## :seedling: Bootstrapping -I basically followed the Step-by-Step Guide: https://jekyllrb.com/docs/step-by-step/01-setup/ - -All necessary Jekyll commands have been already prefixed appropriately. Just use `make` with the respective jekyll command and you should be good to go. - -# :speech_balloon: Feedback? -Open an issue here rather than at Makerworld. I can track feature requests and bugs way easier here in Github. - # :scroll: Licensing * The source code in this repository is licensed under the `MIT License` (see [LICENSE](./LICENSE)). * All 3D models and creative assets (in /models/) are licensed under the `CC BY-NC 4.0 License` (see [/models/LICENSE](./models/LICENSE)). - -# :memo: Todos -* [ ] freeze Gemfile dependencies and make renovate work on it diff --git a/install-asdf.sh b/install-asdf.sh deleted file mode 100755 index 1058e48..0000000 --- a/install-asdf.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -# renovate: datasource=github-releases depName=asdf-vm/asdf versioning=semver -ASDF_VERSION=v0.16.7 - -add_line_to_file_if_not_exists() { - local file="$1" - local line="$2" - - if ! grep -Fxq "$line" "$file"; then - echo "Adding line to $file..." - echo "$line" >> "$file" - fi -} - -# Download and extract the archive -OS=$(uname | tr '[:upper:]' '[:lower:]') -ARCH=$(uname -m) -case "$ARCH" in - x86_64) ARCH="amd64" ;; - aarch64) ARCH="arm64" ;; - *) echo "โŒ Unsupported architecture: $ARCH"; exit 1 ;; -esac -ARCHIVE_URL="https://github.com/asdf-vm/asdf/releases/download/${ASDF_VERSION}/asdf-${ASDF_VERSION}-${OS}-${ARCH}.tar.gz" -INSTALL_DIR="$HOME/.asdf" - -echo "๐Ÿ—‘๏ธ Removing existing asdf installation..." -if [ -d "$INSTALL_DIR" ]; then - rm -rf "$INSTALL_DIR" -fi - -echo "โฌ‡๏ธ Downloading asdf version ${ASDF_VERSION}..." -curl -sSL "$ARCHIVE_URL" -o /tmp/asdf.tar.gz - -echo "๐Ÿ“ฆ Extracting asdf..." -mkdir -p "$INSTALL_DIR" -tar -xzf /tmp/asdf.tar.gz -C "$INSTALL_DIR" - -# Clean up -echo "๐Ÿงน Cleaning up..." -rm /tmp/asdf.tar.gz - -# shellcheck disable=SC2016 -add_line_to_file_if_not_exists "$HOME/.bashrc" 'export PATH="$HOME/.asdf:$PATH"' -# shellcheck disable=SC2016 -add_line_to_file_if_not_exists "$HOME/.bash_profile" 'export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"' -# shellcheck disable=SC2016 -add_line_to_file_if_not_exists "$HOME/.bashrc" '. <(asdf completion bash)' - - -export PATH="$HOME/.asdf:$PATH" -asdf -v - -echo "โœ… asdf version ${ASDF_VERSION} installed successfully. To enable code completion, please restart your terminal or run 'source ~/.bashrc'." diff --git a/page/Makefile b/page/Makefile deleted file mode 100644 index 48215ae..0000000 --- a/page/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -.PHONY: help - -help: - @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) - -.DEFAULT_GOAL := help - -# Jekyll -JEKYLL_CMD = bundle exec jekyll - -.PHONY: serve -serve: ## Serve jekyll site with livereload - @echo "Serving site at http://localhost:4000" - $(JEKYLL_CMD) serve --livereloa - -.PHONY: build -build: ## Build jekyll site - @echo "Building site at target" - $(JEKYLL_CMD) build - -.PHONY: new_post -new-post: ## Create a new post - $(JEKYLL_CMD) new post - -.PHONY: clean -clean: ## Clean jekyll site - @echo "Cleaning site" - $(JEKYLL_CMD) clean diff --git a/renovate.json5 b/renovate.json5 deleted file mode 100644 index 11f63d8..0000000 --- a/renovate.json5 +++ /dev/null @@ -1,62 +0,0 @@ -{ - $schema: "https://docs.renovatebot.com/renovate-schema.json", - platformAutomerge: false, - semanticCommits: "enabled", - semanticCommitType: "deps", - semanticCommitScope: "renovate", - major: { - enabled: true, - addLabels: ["upgrade:major"], - }, - minor: { - enabled: true, - addLabels: ["upgrade:minor"], - }, - patch: { - enabled: true, - addLabels: ["upgrade:patch"], - }, - kubernetes: { - fileMatch: ["\\.y.?ml$"], - }, - vulnerabilityAlerts: { - labels: ["security"], - enabled: true - }, - - packageRules: [ - { - matchUpdateTypes: ["minor", "patch"], - addLabels: ["automerge"], - automerge: true, - // renovate docs: https://docs.renovatebot.com/configuration-options/#matchpackagenames - matchPackageNames: [ - // these are known to work with the regex slashes - "/asdf/", - "/pre-commit/", - "/ruby/", - "/shellcheck/" - ], - } - ], - - customManagers: [ - // for asdf-vm.org tool versions - { - fileMatch: ["\.tool-versions$"], - customType: "regex", - matchStrings: [ - "renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?\\s.* (?.*)\\s" - ], - versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", - }, - { - fileMatch: ["install-asdf.sh$"], - customType: "regex", - matchStrings: [ - "renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s.*=(?.*)\\s" - ], - versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", - }, - ], -}