Skip to content

Commit

Permalink
Merge branch 'main' into close_popup
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisTitusTech authored Sep 30, 2024
2 parents 035e463 + a9a678f commit 412e2a8
Show file tree
Hide file tree
Showing 31 changed files with 587 additions and 577 deletions.
66 changes: 0 additions & 66 deletions .github/release-drafter.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
changelog:
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '📚 Documentation'
label: 'documentation'
- title: '🔒 Security'
label: 'security'
- title: '🧰 GitHub Actions'
label: 'github actions'
exclude:
labels:
- 'skip-changelog'
22 changes: 2 additions & 20 deletions .github/workflows/linutil.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: LinUtil Release

on:
push:
branches: ["main"]
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -55,12 +53,6 @@ jobs:
mv build/x86_64-unknown-linux-musl/release/linutil build/linutil
mv build/aarch64-unknown-linux-musl/release/linutil build/linutil-aarch64
- name: Pull latest changes
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git pull origin main
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Commit Linutil
Expand All @@ -75,28 +67,18 @@ jobs:
echo "version=$version" >> $GITHUB_ENV
shell: bash

- name: Generate Release Notes
id: generate_notes
uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
config-name: release-drafter.yml
version: ${{ env.version }}

- name: Create and Upload Release
id: create_release
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ env.version }}
name: Pre-Release ${{ env.version }}
body: |
${{ steps.generate_notes.outputs.body }}
![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/linutil/${{ env.version }}/linutil)
![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/linutil/${{ env.version }}/linutil-aarch64)
append_body: false
append_body: true
generate_release_notes: true
files: |
./build/linutil
./build/linutil-aarch64
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace.package]
license = "MIT"
version = "24.9.22"
version = "24.9.23"

[workspace.dependencies]
ego-tree = "0.6.2"
Expand Down
3 changes: 2 additions & 1 deletion core/tabs/applications-setup/Developer-tools/vscode-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ installVsCode() {
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install code
;;
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm code
"$AUR_HELPER" -S --needed --noconfirm visual-studio-code-bin
;;
dnf)
"$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc
Expand All @@ -40,4 +40,5 @@ installVsCode() {

checkEnv
checkEscalationTool
checkAURHelper
installVsCode
Loading

0 comments on commit 412e2a8

Please sign in to comment.