Skip to content

Commit

Permalink
chore: merge release-v0.2.9 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjackwills committed Apr 1, 2024
2 parents 431e786 + f348687 commit 128cb8f
Show file tree
Hide file tree
Showing 10 changed files with 979 additions and 486 deletions.
24 changes: 12 additions & 12 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG VARIANT="bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}

RUN printf "alias cls='clear'\nalias ll='ls -l --human-readable --color=auto --group-directories-first --classify --time-style=long-iso -all'" >> /etc/bash.bashrc

ENV PATH="/home/vscode/.cargo/bin:${PATH}"

RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends build-essential pkg-config nmap

USER vscode
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ARG VARIANT="bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}

RUN printf "alias cls='clear'\nalias ll='ls -l --human-readable --color=auto --group-directories-first --classify --time-style=long-iso -all'" >> /etc/bash.bashrc

ENV PATH="/home/vscode/.cargo/bin:${PATH}"

RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends build-essential pkg-config nmap

USER vscode
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
128 changes: 64 additions & 64 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.217.4/containers/rust
{
"name": "Rust",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
// Use bullseye when on local on arm64/Apple Silicon.
"VARIANT": "bullseye"
}
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],

"postCreateCommand": "cargo install cross typos-cli",

"mounts": [
"source=/etc/timezone,target=/etc/timezone,type=bind,readonly"
],

"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"bmuskalla.vscode-tldr",
"christian-kohler.path-intellisense",
"ms-vscode.live-server",
"mutantdino.resourcemonitor",
"rangav.vscode-thunder-client",
"redhat.vscode-yaml",
"rust-lang.rust-analyzer",
"serayuzgur.crates",
"tamasfe.even-better-toml",
"timonwong.shellcheck",
"vadimcn.vscode-lldb"
],

// Set *default* container specific settings.json values on container create.
"settings": {
"lldb.executable": "/usr/bin/lldb",
// VS Code don't watch files under ./target
"files.watcherExclude": {
"**/target/**": true
},
"rust-analyzer.checkOnSave.command": "clippy"
}
}
},
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"version": "latest",
"moby": true,
"dockerDashComposeVersion":"v2"
},
"ghcr.io/devcontainers/features/git:1": {
"version":"os-provided"
}
}
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.217.4/containers/rust
{
"name": "Rust",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
// Use bullseye when on local on arm64/Apple Silicon.
"VARIANT": "bullseye"
}
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],

"postCreateCommand": "cargo install cross typos-cli",

"mounts": [
"source=/etc/timezone,target=/etc/timezone,type=bind,readonly",
"source=/run/shm,target=/dev/shm,type=bind"
],

"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"bmuskalla.vscode-tldr",
"christian-kohler.path-intellisense",
"foxundermoon.shell-format",
"mutantdino.resourcemonitor",
"redhat.vscode-yaml",
"rust-lang.rust-analyzer",
"serayuzgur.crates",
"tamasfe.even-better-toml",
"timonwong.shellcheck",
"vadimcn.vscode-lldb"
],

// Set *default* container specific settings.json values on container create.
"settings": {
"lldb.executable": "/usr/bin/lldb",
// VS Code don't watch files under ./target
"files.watcherExclude": {
"**/target/**": true
},
"rust-analyzer.checkOnSave.command": "clippy"
}
}
},
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"version": "latest",
"moby": true,
"dockerDashComposeVersion":"v2"
},
"ghcr.io/devcontainers/features/git:1": {
"version":"os-provided"
}
}
}
Binary file modified .github/pi_cam.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 7 additions & 9 deletions .github/release-body.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
### 2023-11-17
### 2024-04-01

### Chores
+ dependencies updated, [a75ba8ab158009658f26394ce7361fcbfab892bb], [c978e98ef37d7f598d12cdb819569a44ceda5b9e]
+ Rust 1.74.0 linting, [9da794356bd6dd080619fb6661a99acc6643378d]
+ linting moved from main.rs to Cargot.toml, [c30163273ca8f69455690f46eb3be1b49a4aee2f]
+ .gitattributes updated, [c33cfb31201f3b261602b8e5342d066cd1cc31c7]
+ .devcontainer updated, [458385e81c9983d5d4de35da2716b2cd401df66a], [9e31ac43c6e18ac9e2ee5ca4c50cd3ce1c9ba6f8]
+ GitHub workflow use matrix build, [c560e09c0efed3374c9c1ea243c6dd1b5fd27842], [d5337113eee43667ce8099364f171cf843bb7883]
+ Rust 1.73.0 linting, [1aa2a554c4c2ddb9b8f210fef0fae9cdbb712a77]
+ .devcontainer updated, [83eafa5cc65e5d5edc3da652530157f4906ff65e], [c8f08455480e75a2a38ae188c0a883ec3d027496]
+ dependencies updated, [35b5a9f105973e76e875c0ec69888ab820da0353], [1b73cca376e3729cfda11ad7657a1d27125a1b93], [c22dda47d9c7b28ec184b0638e14e4a254bc7814], [e0ebe1efea9010fd9db078f843d4542632685d55]
+ github workflow updated, [c4c6cb86806c6ace38380657a0144f6bf75edc1b]

### Fixes
+ systemd chown fix, [0b346ab5b89668d40e2bc8375cc789a1229231d3]
+ line ending, [4cc276724964688847a3ac9cb5856a02b8b5f893], [5d57a448a3fddf40f737101f6ee8efb8c36b6d7d]

### Refactors
+ allow cognitive_complexity, [88d616247f9024526630ad24e77f9c109d4b09f3]

see <a href='https://github.com/mrjackwills/leafcast_pi/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
37 changes: 17 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ name: Release CI
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- "v[0-9]+.[0-9]+.[0-9]+"
jobs:
cross_platform_build:
strategy:
matrix:
platform:
- target: aarch64-unknown-linux-musl
output_name: linux_aarch64.tar.gz

- target: arm-unknown-linux-musleabihf
output_name: linux_armv6.tar.gz

runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -23,30 +27,23 @@ jobs:
- name: install cross
run: cargo install cross --git https://github.com/cross-rs/cross

# Set env's
- name: set names
run: |
translate_platform() { case "$1" in aarch64-unknown-linux-musl) echo "aarch64.tar.gz";; arm-unknown-linux-musleabihf) echo "armv6.tar.gz";; *) echo "Error: Unsupported platform $1"; exit 1;; esac; }
target_platform="${{ matrix.platform.target }}"
output_name=$(translate_platform "$target_platform")
echo "TARGET_OUTPUT_NAME=${output_name}" >> $GITHUB_ENV
echo "TARGET_PLATFORM=${target_platform}" >> $GITHUB_ENV
# Build binary
- name: build
run: cross build --target "${TARGET_PLATFORM}" --release

# Compress, rename, and move
- name: compress
run: tar -C "target/${TARGET_PLATFORM}/release" -czf "./leafcast_${TARGET_OUTPUT_NAME}" leafcast
run: cross build --target ${{ matrix.target }} --release

# Compress the output
- name: compress linux
if: matrix.target != 'x86_64-pc-windows-gnu'
run: |
tar -C "target/${{ matrix.target }}/release" -czf "./oxker_${{ matrix.output_name }}" oxker
# Upload output for release page
- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: ${{ env.TARGET_PLATFORM }}
path: leafcast_${{ env.TARGET_OUTPUT_NAME }}
name: ${{ matrix.target }}
path: leafcast_${{ matrix.output_name }}
retention-days: 1

###################
Expand All @@ -61,7 +58,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup | Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Update Release
uses: ncipollo/release-action@v1
Expand All @@ -72,4 +69,4 @@ jobs:
bodyFile: ".github/release-body.md"
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: |
**/leafcast_*.tar.gz
**/leafcast_*.tar.gz
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# <a href='https://github.com/mrjackwills/leafcast_pi/releases/tag/v0.2.9'>v0.2.9</a>
### 2024-04-01

### Chores
+ .devcontainer updated,[83eafa5c](https://github.com/mrjackwills/leafcast_pi/commit/83eafa5cc65e5d5edc3da652530157f4906ff65e),[c8f08455](https://github.com/mrjackwills/leafcast_pi/commit/c8f08455480e75a2a38ae188c0a883ec3d027496)
+ dependencies updated,[35b5a9f1](https://github.com/mrjackwills/leafcast_pi/commit/35b5a9f105973e76e875c0ec69888ab820da0353),[1b73cca3](https://github.com/mrjackwills/leafcast_pi/commit/1b73cca376e3729cfda11ad7657a1d27125a1b93),[c22dda47](https://github.com/mrjackwills/leafcast_pi/commit/c22dda47d9c7b28ec184b0638e14e4a254bc7814),[e0ebe1ef](https://github.com/mrjackwills/leafcast_pi/commit/e0ebe1efea9010fd9db078f843d4542632685d55)
+ github workflow updated,[c4c6cb86](https://github.com/mrjackwills/leafcast_pi/commit/c4c6cb86806c6ace38380657a0144f6bf75edc1b)

### Fixes
+ line ending,[4cc27672](https://github.com/mrjackwills/leafcast_pi/commit/4cc276724964688847a3ac9cb5856a02b8b5f893),[5d57a448](https://github.com/mrjackwills/leafcast_pi/commit/5d57a448a3fddf40f737101f6ee8efb8c36b6d7d)

### Refactors
+ allow cognitive_complexity,[88d61624](https://github.com/mrjackwills/leafcast_pi/commit/88d616247f9024526630ad24e77f9c109d4b09f3)
# <a href='https://github.com/mrjackwills/leafcast_pi/releases/tag/v0.2.8'>v0.2.8</a>
### 2023-11-17

Expand Down
Loading

0 comments on commit 128cb8f

Please sign in to comment.