Merge pull request #118 from autotag-dev/joem/new-org

new org updates
autotag-dev · Nov 20, 2024 · 8fc9461 · 8fc9461
2 parents 3f96290 + 422ead4
commit 8fc9461
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 164 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -61,54 +61,54 @@ jobs:
           version: latest
           args: check
 
-  release:
-    permissions:
-      # allow goreleaser to access the Releases API
-      contents: write
-    # Checks if this is a merge into the master(main) and creates a new release if yes.
-    if: github.event_name != 'pull_request'
-    needs: [test, lint, goreleaser-check]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Go Modules Cache
-        uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Build binary
-        run: |
-          make build
-          chmod +x ./autotag/autotag
-
-      - name: Autotag Merge Commit
-        # TODO: replace this with GitHub Action after #41
-        run: |
-          ./autotag/autotag
-
-          echo "tags:" && git tag -l
-
-      - name: Install rpm
-        run: |
-          sudo apt-get -qqy update && sudo apt-get -qqy install rpm
-
-      - name: Docker Login
-        uses: docker/login-action@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USER }}
-          password: ${{ secrets.QUAY_PASSWD }}
-
-      - name: Deploy Autotag Release
-        # TODO(vtopc): switch to the `goreleaser/goreleaser-action` GHA?
-        run: |
-          curl -sL https://git.io/goreleaser | bash -s -- --parallelism=2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # release:
+  #   permissions:
+  #     # allow goreleaser to access the Releases API
+  #     contents: write
+  #   # Checks if this is a merge into the master(main) and creates a new release if yes.
+  #   if: github.event_name != 'pull_request'
+  #   needs: [test, lint, goreleaser-check]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Restore Go Modules Cache
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: ~/go/pkg/mod
+  #         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-go-
+
+  #     - name: Build binary
+  #       run: |
+  #         make build
+  #         chmod +x ./autotag/autotag
+
+  #     - name: Autotag Merge Commit
+  #       # TODO: replace this with GitHub Action after #41
+  #       run: |
+  #         ./autotag/autotag
+
+  #         echo "tags:" && git tag -l
+
+  #     - name: Install rpm
+  #       run: |
+  #         sudo apt-get -qqy update && sudo apt-get -qqy install rpm
+
+  #     - name: Docker Login
+  #       uses: docker/login-action@v1
+  #       with:
+  #         registry: quay.io
+  #         username: ${{ secrets.QUAY_USER }}
+  #         password: ${{ secrets.QUAY_PASSWD }}
+
+  #     - name: Deploy Autotag Release
+  #       # TODO(vtopc): switch to the `goreleaser/goreleaser-action` GHA?
+  #       run: |
+  #         curl -sL https://git.io/goreleaser | bash -s -- --parallelism=2
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/catalog.yaml b/.github/workflows/catalog.yaml
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -105,24 +105,10 @@ archives:
       - goos: windows
         format: zip
 
-# homebrew
-# brews:
-#   - ids:
-#       - archives
-#     github:
-#       owner: pantheon-systems
-#       name: homebrew-taps
-#     commit_author:
-#       name: pantheon releases
-#       email: [email protected]
-#     folder: Formula
-#     homepage: "https://github.com/pantheon-systems/autotag"
-#     description: "Automatically add version tags to a git repo based on commit messages."
-
 dockers:
   - dockerfile: Dockerfile
     image_templates:
-      - "quay.io/pantheon-public/autotag:{{ .Tag }}" # v1.0.0
-      - "quay.io/pantheon-public/autotag:v{{ .Major }}" # v1
-      - "quay.io/pantheon-public/autotag:v{{ .Major }}.{{ .Minor }}" # v1.0
-      - "quay.io/pantheon-public/autotag:latest"
+      - "ghcr.io/autotag-dev/autotag:{{ .Tag }}" # v1.0.0
+      - "ghcr.io/autotag-dev/autotag:v{{ .Major }}" # v1
+      - "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}" # v1.0
+      - "ghcr.io/autotag-dev/autotag:latest"
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,3 +1 @@
- https://help.github.com/en/articles/about-code-owners
-
-* @pantheon-systems/releng-squad
+* @autotag-dev/maintainers
diff --git a/autotag/main.go b/autotag/main.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"os"
 
+	"github.com/autotag-dev/autotag"
 	"github.com/jessevdk/go-flags"
-	"github.com/pantheon-systems/autotag"
 )
 
 // Options holds the CLI args

diff --git a/docs/README.md b/docs/README.md
@@ -1,9 +1,8 @@
 AutoTag
 =======
 
-[![CI](https://github.com/pantheon-systems/autotag/actions/workflows/workflow.yml/badge.svg)](https://github.com/pantheon-systems/autotag/actions/workflows/workflow.yml)
-[![Go Report Card](https://goreportcard.com/badge/github.com/pantheon-systems/autotag)](https://goreportcard.com/report/github.com/pantheon-systems/autotag)
-[![Actively Maintained](https://img.shields.io/badge/Pantheon-Actively_Maintained-yellow?logo=pantheon&color=FFDC28)](https://pantheon.io/docs/oss-support-levels#actively-maintained-support)
+[![CI](https://github.com/autotag-dev/autotag/actions/workflows/workflow.yml/badge.svg)](https://github.com/autotag-dev/autotag/actions/workflows/workflow.yml)
+[![Go Report Card](https://goreportcard.com/badge/github.com/autotag-dev/autotag)](https://goreportcard.com/report/github.com/autotag-dev/autotag)
 
 
 Automatically increment version tags to a git repo based on commit messages.
@@ -50,9 +49,9 @@ Installing
 
 | Arch  | Images                                                           |
 | ----- | ---------------------------------------------------------------- |
-| amd64 | `quay.io/pantheon-public/autotag:latest`, `vX.Y.Z`, `vX.Y`, `vX` |
+| amd64 | `ghcr.io/autotag-dev/autotag:latest`, `vX.Y.Z`, `vX.Y`, `vX` |
 
-[releases]: https://github.com/pantheon-systems/autotag/releases/latest
+[releases]: https://github.com/autotag-dev/autotag/releases/latest
 
 ### One-liner
 
@@ -289,7 +288,7 @@ Assuming you have Go 1.5+ installed you can checkout and run make deps build to
 at `./autotag/autotag`.
 
 ```console
-git clone git@github.com:pantheon-systems/autotag.git
+git clone https://github.com/autotag-dev/autotag.git
 
 cd autotag
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/pantheon-systems/autotag
+module github.com/autotag-dev/autotag
 
 go 1.20