Revert "Temp allow release from release-workflow"

This reverts commit b7eb5d5.

.github/workflows/release.yml

@@ -169,30 +169,20 @@ jobs:
         run: |
           ./distribution/prepare_artifact_win.ps1 ${{ github.sha }}
 
-      - name: Create zip
-        uses: thedoctor0/[email protected]
-        if: ${{ matrix.name == 'win' || matrix.name == 'osx' }}
-        with:
-          type: "zip"
-          directory: "./_output/"
-          path: "."
-          filename: "../_artifacts/Maintainerr.${{ needs.semantic-release-dry.outputs.version }}.${{ matrix.name }}-${{ matrix.architecture }}.zip"
-
-      - name: Publish zip artifact
+      - name: Create and publish zip artifact
         uses: actions/upload-artifact@v4
-        if: ${{ matrix.name == 'win' || matrix.name == 'osx' }}
+        if: ${{ matrix.name == 'win' }}
         with:
+          include-hidden-files: true
           name: Maintainerr.${{ needs.semantic-release-dry.outputs.version }}.${{ matrix.name }}-${{ matrix.architecture }}.zip
-          path: ${{ github.workspace }}/_artifacts/
+          path: ${{ github.workspace }}/_output/
 
       - name: Create tar
-        uses: thedoctor0/[email protected]
         if: ${{ matrix.name == 'osx' || matrix.name == 'linux' }}
-        with:
-          type: "tar"
-          directory: "./_output/"
-          path: "."
-          filename: "../_artifacts/Maintainerr.${{ needs.semantic-release-dry.outputs.version }}.${{ matrix.name }}-${{ matrix.architecture }}.tar.gz"
+        shell: pwsh
+        run: |
+          cd ./_output/
+          tar -zcf ../_artifacts/Maintainerr.${{ needs.semantic-release-dry.outputs.version }}.${{ matrix.name }}-${{ matrix.architecture }}.tar.gz .
 
       - name: Publish tar artifact
         uses: actions/upload-artifact@v4

Dockerfile

@@ -11,12 +11,10 @@ COPY . .
 RUN yarn install --network-timeout 99999999
 RUN yarn cache clean
 
-RUN <<EOF cat >> ./ui/.env
-NEXT_PUBLIC_BASE_PATH=/__PATH_PREFIX__
-EOF
-
 RUN sed -i "s,basePath: '',basePath: '/__PATH_PREFIX__',g" ./ui/next.config.js
 
+RUN mv ./ui/.env.docker ./ui/.env.production
+
 RUN yarn turbo build
 
 FROM base AS runner
@@ -32,15 +30,15 @@ COPY --from=builder --chmod=777 --chown=node:node /app/ui/public ./ui/public
 COPY --from=builder --chmod=777 --chown=node:node /app/server/dist ./server
 COPY --from=builder --chmod=777 --chown=node:node /app/server/package.json ./server/package.json
 COPY --from=builder --chmod=777 --chown=node:node /app/server/node_modules ./server/node_modules
+COPY --from=builder --chmod=777 --chown=node:node /app/server/.env ./server/.env
+COPY --from=builder --chmod=777 --chown=node:node /app/server/.env.docker ./server/.env.production
 
 COPY distribution/docker/supervisord.conf /etc/supervisord.conf
 COPY --chmod=777 --chown=node:node distribution/docker/start.sh /opt/app/start.sh
 
 ARG GIT_SHA
 
-RUN mv /opt/app/ui/.env.docker /opt/app/ui/.env.production
-RUN mv /opt/app/server/.env.docker /opt/app/server/.env.production
-RUN sed -i "s/%GIT_SHA%/$GIT_SHA/g" _output/server/.env.production
+RUN sed -i "s/%GIT_SHA%/$GIT_SHA/g" ./server/.env.production
 
 # Create required directories
 RUN mkdir -m 777 /opt/data && \

distribution/prepare_artifact_win.ps1

@@ -9,16 +9,16 @@ if ($SHA -notmatch '^[0-9a-fA-F]{40}$') {
 
 New-Item -ItemType Directory -Force -Path "_output"
 New-Item -ItemType Directory -Force -Path "_artifacts"
-Copy-Item -Recurse -Force "ui/.next/standalone/ui" "_output/ui"
-Copy-Item -Recurse -Force "ui/.next/static" "_output/ui/.next/static"
-Copy-Item -Recurse -Force "ui/public" "_output/ui/public"
-Copy-Item -Force "ui/.env.distribution" "_output/ui/.env"
-Copy-Item -Force "ui/.env" "_output/ui/.env.production"
-Copy-Item -Recurse -Force "server/dist" "_output/server"
-Copy-Item -Force "server/package.json" "_output/server/package.json"
-Copy-Item -Force "server/.env.distribution" "_output/server/.env"
-Copy-Item -Force "server/.env" "_output/server/.env.production"
-Copy-Item -Recurse -Force "server/node_modules" "_output/server/node_modules"
-Copy-Item -Recurse -Force "distribution/linux" "_output"
+Copy-Item -Recurse -Force "ui\.next\standalone\ui" "_output\ui"
+Copy-Item -Recurse -Force "ui\.next\static" "_output\ui\.next\static"
+Copy-Item -Recurse -Force "ui\public" "_output\ui\public"
+Copy-Item -Force "ui\.env.distribution" "_output\ui\.env"
+Copy-Item -Force "ui\.env" "_output\ui\.env.production"
+Copy-Item -Recurse -Force "server\dist" "_output\server"
+Copy-Item -Force "server\package.json" "_output\server\package.json"
+Copy-Item -Force "server\.env.distribution" "_output\server\.env"
+Copy-Item -Force "server\.env" "_output\server\.env.production"
+Copy-Item -Recurse -Force "server\node_modules" "_output\server\node_modules"
+Copy-Item -Recurse -Force "distribution\win\*" "_output"
 
-(Get-Content "_output/server/.env.production") -replace '%GIT_SHA%', $SHA | Set-Content "_output/server/.env.production"
+(Get-Content "_output\server\.env.production") -replace '%GIT_SHA%', $SHA | Set-Content "_output\server\.env.production"

package.json

@@ -72,8 +72,7 @@
       "semantic-release-gha-output"
     ],
     "branches": [
-      "main",
-      "release-workflow"
+      "main"
     ],
     "npmPublish": false,
     "publish": [