mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
rename backend to core
This commit is contained in:
bbedward
6
.github/workflows/go-ci.yml
vendored
6
.github/workflows/go-ci.yml
vendored
@@ -5,7 +5,7 @@ on:
|
||||
branches:
|
||||
- '**'
|
||||
paths:
|
||||
- 'backend/**'
|
||||
- 'core/**'
|
||||
- '.github/workflows/go-ci.yml'
|
||||
|
||||
jobs:
|
||||
@@ -13,7 +13,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: backend
|
||||
working-directory: core
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: ./backend/go.mod
|
||||
go-version-file: ./core/go.mod
|
||||
|
||||
- name: Format check
|
||||
run: |
|
||||
|
||||
72
.github/workflows/release.yml
vendored
72
.github/workflows/release.yml
vendored
@@ -14,7 +14,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build-backend:
|
||||
build-core:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
|
||||
defaults:
|
||||
run:
|
||||
working-directory: backend
|
||||
working-directory: core
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: ./backend/go.mod
|
||||
go-version-file: ./core/go.mod
|
||||
|
||||
- name: Run tests
|
||||
run: go test -v ./...
|
||||
@@ -93,31 +93,31 @@ jobs:
|
||||
if: matrix.arch == 'arm64'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: backend-assets-${{ matrix.arch }}
|
||||
name: core-assets-${{ matrix.arch }}
|
||||
path: |
|
||||
backend/dankinstall-${{ matrix.arch }}.gz
|
||||
backend/dankinstall-${{ matrix.arch }}.gz.sha256
|
||||
backend/dms-${{ matrix.arch }}.gz
|
||||
backend/dms-${{ matrix.arch }}.gz.sha256
|
||||
backend/dms-distropkg-${{ matrix.arch }}.gz
|
||||
backend/dms-distropkg-${{ matrix.arch }}.gz.sha256
|
||||
core/dankinstall-${{ matrix.arch }}.gz
|
||||
core/dankinstall-${{ matrix.arch }}.gz.sha256
|
||||
core/dms-${{ matrix.arch }}.gz
|
||||
core/dms-${{ matrix.arch }}.gz.sha256
|
||||
core/dms-distropkg-${{ matrix.arch }}.gz
|
||||
core/dms-distropkg-${{ matrix.arch }}.gz.sha256
|
||||
if-no-files-found: error
|
||||
|
||||
- name: Upload artifacts with completions
|
||||
if: matrix.arch == 'amd64'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: backend-assets-${{ matrix.arch }}
|
||||
name: core-assets-${{ matrix.arch }}
|
||||
path: |
|
||||
backend/dankinstall-${{ matrix.arch }}.gz
|
||||
backend/dankinstall-${{ matrix.arch }}.gz.sha256
|
||||
backend/dms-${{ matrix.arch }}.gz
|
||||
backend/dms-${{ matrix.arch }}.gz.sha256
|
||||
backend/dms-distropkg-${{ matrix.arch }}.gz
|
||||
backend/dms-distropkg-${{ matrix.arch }}.gz.sha256
|
||||
backend/completion.bash
|
||||
backend/completion.fish
|
||||
backend/completion.zsh
|
||||
core/dankinstall-${{ matrix.arch }}.gz
|
||||
core/dankinstall-${{ matrix.arch }}.gz.sha256
|
||||
core/dms-${{ matrix.arch }}.gz
|
||||
core/dms-${{ matrix.arch }}.gz.sha256
|
||||
core/dms-distropkg-${{ matrix.arch }}.gz
|
||||
core/dms-distropkg-${{ matrix.arch }}.gz.sha256
|
||||
core/completion.bash
|
||||
core/completion.fish
|
||||
core/completion.zsh
|
||||
if-no-files-found: error
|
||||
|
||||
update-versions:
|
||||
@@ -142,10 +142,10 @@ jobs:
|
||||
# Update VERSION file in quickshell/
|
||||
echo "${version}" > quickshell/VERSION
|
||||
|
||||
# Update version in backend/flake.nix
|
||||
sed -i "s/version = \"[^\"]*\"/version = \"$version_no_v\"/" backend/flake.nix
|
||||
# Update version in core/flake.nix
|
||||
sed -i "s/version = \"[^\"]*\"/version = \"$version_no_v\"/" core/flake.nix
|
||||
|
||||
git add quickshell/VERSION backend/flake.nix
|
||||
git add quickshell/VERSION core/flake.nix
|
||||
|
||||
if ! git diff --cached --quiet; then
|
||||
git commit -m "chore: bump version to $version"
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
|
||||
release:
|
||||
runs-on: ubuntu-24.04
|
||||
needs: build-backend
|
||||
needs: build-core
|
||||
env:
|
||||
TAG: ${{ github.ref_name }}
|
||||
steps:
|
||||
@@ -166,12 +166,12 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Download backend artifacts
|
||||
- name: Download core artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: backend-assets-*
|
||||
pattern: core-assets-*
|
||||
merge-multiple: true
|
||||
path: ./_backend_assets
|
||||
path: ./_core_assets
|
||||
|
||||
- name: Generate Changelog
|
||||
id: changelog
|
||||
@@ -233,8 +233,8 @@ jobs:
|
||||
|
||||
mkdir -p _release_assets
|
||||
|
||||
# Copy backend binaries and rename dms-*.gz to dms-cli-*.gz
|
||||
for file in _backend_assets/dms-*.gz*; do
|
||||
# Copy core binaries and rename dms-*.gz to dms-cli-*.gz
|
||||
for file in _core_assets/dms-*.gz*; do
|
||||
if [ -f "$file" ]; then
|
||||
basename=$(basename "$file")
|
||||
if [[ "$basename" == dms-distropkg-* ]]; then
|
||||
@@ -247,10 +247,10 @@ jobs:
|
||||
done
|
||||
|
||||
# Copy dankinstall binaries
|
||||
cp _backend_assets/dankinstall-*.gz* _release_assets/
|
||||
cp _core_assets/dankinstall-*.gz* _release_assets/
|
||||
|
||||
# Copy completions
|
||||
cp _backend_assets/completion.* _release_assets/ 2>/dev/null || true
|
||||
cp _core_assets/completion.* _release_assets/ 2>/dev/null || true
|
||||
|
||||
# Create QML source package (exclude build artifacts and git files)
|
||||
# Tar the CONTENTS of quickshell/, not the directory itself
|
||||
@@ -272,18 +272,18 @@ jobs:
|
||||
tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms
|
||||
|
||||
# Add CLI binaries
|
||||
if [ -f "_backend_assets/dms-${arch}.gz" ]; then
|
||||
gunzip -c "_backend_assets/dms-${arch}.gz" > _temp_full/bin/dms
|
||||
if [ -f "_core_assets/dms-${arch}.gz" ]; then
|
||||
gunzip -c "_core_assets/dms-${arch}.gz" > _temp_full/bin/dms
|
||||
chmod +x _temp_full/bin/dms
|
||||
fi
|
||||
|
||||
if [ -f "_backend_assets/dms-distropkg-${arch}.gz" ]; then
|
||||
gunzip -c "_backend_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
|
||||
if [ -f "_core_assets/dms-distropkg-${arch}.gz" ]; then
|
||||
gunzip -c "_core_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
|
||||
chmod +x _temp_full/bin/dms-distropkg
|
||||
fi
|
||||
|
||||
# Add shell completions
|
||||
for completion in _backend_assets/completion.*; do
|
||||
for completion in _core_assets/completion.*; do
|
||||
if [ -f "$completion" ]; then
|
||||
cp "$completion" _temp_full/completions/
|
||||
fi
|
||||
|
||||
14
.github/workflows/update-vendor-hash.yml
vendored
14
.github/workflows/update-vendor-hash.yml
vendored
@@ -3,8 +3,8 @@ name: Update Vendor Hash
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- "backend/go.mod"
|
||||
- "backend/go.sum"
|
||||
- "core/go.mod"
|
||||
- "core/go.sum"
|
||||
branches:
|
||||
- NOOP
|
||||
|
||||
@@ -20,13 +20,13 @@ jobs:
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
|
||||
- name: Update vendorHash in backend/flake.nix
|
||||
- name: Update vendorHash in core/flake.nix
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# Try to build and capture the expected hash from error message
|
||||
echo "Attempting nix build to get new vendorHash..."
|
||||
cd backend
|
||||
cd core
|
||||
if output=$(nix build .#dms-cli 2>&1); then
|
||||
echo "Build succeeded, no hash update needed"
|
||||
exit 0
|
||||
@@ -66,11 +66,11 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
if ! git diff --quiet backend/flake.nix; then
|
||||
if ! git diff --quiet core/flake.nix; then
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
git add backend/flake.nix
|
||||
git add core/flake.nix
|
||||
git commit -m "flake: update vendorHash for go.mod changes"
|
||||
|
||||
for attempt in 1 2 3; do
|
||||
@@ -86,5 +86,5 @@ jobs:
|
||||
echo "Failed to push after retries" >&2
|
||||
exit 1
|
||||
else
|
||||
echo "No changes to backend/flake.nix"
|
||||
echo "No changes to core/flake.nix"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user