diff --git a/.forgejo/workflows/release-artifacts.yaml b/.forgejo/workflows/release-artifacts.yaml index 0007c3ca..c8759a47 100644 --- a/.forgejo/workflows/release-artifacts.yaml +++ b/.forgejo/workflows/release-artifacts.yaml @@ -19,10 +19,10 @@ jobs: - name: Print environment info run: dotnet --info - name: Build release artifacts - run: make release-artifacts "ARCHIVE_BASENAME=$REPO" "ARCHIVE_VERSION=$VERSION" VERBOSE=true DEP_VULN_WERROR=true + run: make release-artifacts "ARCHIVE_BASENAME=$REPO" "ARCHIVE_VERSION=$RELEASE_VERSION" VERBOSE=true DEP_VULN_WERROR=true env: REPO: ${{ github.event.repository.name }} - VERSION: ${{ github.ref_name }} + RELEASE_VERSION: ${{ github.ref_name }} - name: Upload artifacts uses: actions/release-action@main with: diff --git a/Makefile b/Makefile index 7752abd7..553aaf1b 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,8 @@ ARTIFACT_CMD = tar caf ${ARTIFACT_DIR}/${ARCHIVE_FILENAME} --transform 's,^ --release-pre: @echo 'Compiling database model...' - @dotnet tool install -g dotnet-ef > /dev/null - @dotnet dotnet ef -p Iceshrimp.Backend dbcontext optimize -o Core/Database/Model --suffix '.g' > /dev/null + @dotnet tool install --tool-path ./bin dotnet-ef > /dev/null + @./bin/dotnet-ef -p Iceshrimp.Backend dbcontext optimize -o Core/Database/Model --suffix '.g' > /dev/null @echo 'Building release artifacts for targets: ${RELEASE_TARGETS}' @echo 'This will take a while.' @echo