From 4db1bbec38809d1937515d573ad82f0c99e63628 Mon Sep 17 00:00:00 2001 From: Damillora Date: Mon, 24 Feb 2025 15:06:40 +0000 Subject: [PATCH] fix: remove dependence on git commit --- .github/workflows/dev.yml | 18 +----------------- pkg/web/svelte.config.js | 6 +----- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 73c32e4..135ff71 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -32,23 +32,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build Binaries - id: docker_build_bin - uses: docker/build-push-action@v6 - with: - platforms: ${{ matrix.platform }} - target: runtime - outputs: | - type=local,dest=./output/${{ env.PLATFORM }} - - - name: Upload Binaries - uses: actions/upload-artifact@v4 - with: - name: phoebe-${{ env.PLATFORM }} - path: ./output - retention-days: 7 - - - name: Build and push (No tag) + name: Build and push id: docker_build_git uses: docker/build-push-action@v6 with: diff --git a/pkg/web/svelte.config.js b/pkg/web/svelte.config.js index 8e192df..0ada47e 100644 --- a/pkg/web/svelte.config.js +++ b/pkg/web/svelte.config.js @@ -2,8 +2,6 @@ import adapter from "@sveltejs/adapter-static"; import { execSync } from "child_process"; import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; -const commit = execSync('git rev-parse HEAD').toString().trim().substring(0, 7); - /** @type {import('@sveltejs/kit').Config} */ const config = { // Consult https://kit.svelte.dev/docs/integrations#preprocessors @@ -18,9 +16,7 @@ const config = { fallback: 'app.html', // may differ from host to host }), version: { - - name: `${process.env.npm_package_version}-${commit}`, - + name: `${process.env.npm_package_version}`, } }, };