From c6e4335167301df6c676c7083dcae25ac381540a Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Date: Sun, 12 Jan 2025 11:35:03 -0300
Subject: [PATCH] wip

---
 .github/workflows/nightly-new.yml | 19 ++++++++------
 .github/workflows/release-new.yml | 42 -------------------------------
 .goreleaser.yaml                  | 11 +-------
 3 files changed, 12 insertions(+), 60 deletions(-)
 delete mode 100644 .github/workflows/release-new.yml

diff --git a/.github/workflows/nightly-new.yml b/.github/workflows/nightly-new.yml
index f5e5431aa3..2cbdf088e3 100644
--- a/.github/workflows/nightly-new.yml
+++ b/.github/workflows/nightly-new.yml
@@ -1,7 +1,10 @@
-name: nightly-oss
+name: snapshot-oss
+
+# TODO: make it auto-snapshot/nightly/release (?)
 
 on:
   workflow_dispatch:
+  pull_request:
   schedule:
     - cron: 0 0 * * *
 
@@ -35,8 +38,8 @@ jobs:
       - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "nightly"
-          args: release --clean --nightly --split
+          version: "snapshot"
+          args: release --clean --snapshot --split
         env:
           TARGET: ${{ env.TARGET }}
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
@@ -65,8 +68,8 @@ jobs:
       - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "nightly"
-          args: release --clean --nightly --split
+          version: "snapshot"
+          args: release --clean --snapshot --split
         env:
           TARGET: ${{ env.TARGET }}
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
@@ -94,8 +97,8 @@ jobs:
       - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "nightly"
-          args: release --clean --nightly --split
+          version: "snapshot"
+          args: release --clean --snapshot --split
         env:
           TARGET: ${{ env.TARGET }}
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
@@ -142,7 +145,7 @@ jobs:
       - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "nightly"
+          version: "snapshot"
           args: continue --merge
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/release-new.yml b/.github/workflows/release-new.yml
deleted file mode 100644
index 1234d082ef..0000000000
--- a/.github/workflows/release-new.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: goreleaser
-
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    tags:
-      - "*"
-
-permissions:
-  contents: write
-  packages: write
-  issues: write
-  id-token: write
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    env:
-      flags: ""
-    steps:
-      - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        run: echo "flags=--snapshot" >> $GITHUB_ENV
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: mlugg/setup-zig@v1
-      - run: rustup default nightly
-      - run: cargo install --locked cargo-zigbuild
-      - run: cargo fetch --locked
-      - uses: goreleaser/goreleaser-action@v6
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser
-          # 'latest', 'nightly', or a semver
-          version: "~> v2"
-          args: release --clean ${{ env.flags }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
-          # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GH_PAT: ${{ secrets.GH_PAT }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 0ba6aa8027..7e658b7797 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -36,7 +36,6 @@ builds:
     - id: wayland
       builder: rust
       command: build
-      # dir: ./frontends/rioterm/
       flags:
           - -p=rioterm
           - --release
@@ -49,7 +48,6 @@ builds:
     - id: x11
       builder: rust
       command: build
-      # dir: ./frontends/rioterm/
       flags:
           - -p=rioterm
           - --release
@@ -77,14 +75,7 @@ nfpms:
 
 archives:
     - format: tar.gz
-      # this name template makes the OS and Arch compatible with the results of `uname`.
-      name_template: >-
-          {{ .ProjectName }}_
-          {{- title .Os }}_
-          {{- if eq .Arch "amd64" }}x86_64
-          {{- else if eq .Arch "386" }}i386
-          {{- else }}{{ .Arch }}{{ end }}
-      # use zip for windows archives
+      name_template: "{{ .ProjectName }}_{{ .Target }}"
       format_overrides:
           - goos: windows
             format: zip