From 8b991358a83810239ee6b51c382680c5749c580e Mon Sep 17 00:00:00 2001
From: Jordan Oroshiba <jordan@astria.org>
Date: Wed, 24 Apr 2024 08:40:18 -0700
Subject: [PATCH] minimum changes required for fork (#2)

Updates the codeowners and sets a new package repo for `astria-geth`
repo.

Once this is merged, I can push the astria specific tags and we will get
built images for old tags on this repo.
---
 .github/CODEOWNERS                            | 20 +------------------
 .../astria-build-and-publish-image.yml        | 14 ++++++-------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index faf922df01..b249f68dfc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,22 +1,4 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-accounts/usbwallet              @karalabe
-accounts/scwallet               @gballet
-accounts/abi                    @gballet @MariusVanDerWijden
-cmd/clef                        @holiman
-consensus                       @karalabe
-core/                           @karalabe @holiman @rjl493456442
-eth/                            @karalabe @holiman @rjl493456442
-eth/catalyst/                   @gballet
-eth/tracers/                    @s1na
-graphql/                        @s1na
-les/                            @zsfelfoldi @rjl493456442
-light/                          @zsfelfoldi @rjl493456442
-node/                           @fjl
-p2p/                            @fjl @zsfelfoldi
-rpc/                            @fjl @holiman
-p2p/simulations                 @fjl
-p2p/protocols                   @fjl
-p2p/testing                     @fjl
-signer/                         @holiman
+*      @joroshiba @mycodecrafting @noot
diff --git a/.github/workflows/astria-build-and-publish-image.yml b/.github/workflows/astria-build-and-publish-image.yml
index b59033f35a..14df557ca0 100644
--- a/.github/workflows/astria-build-and-publish-image.yml
+++ b/.github/workflows/astria-build-and-publish-image.yml
@@ -5,13 +5,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "release/1.13"
+      - "main"
     tags:
-      - "geth1.13-v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
   # trigger on pull request updates when target is `astria` branch
   pull_request:
     branches:
-      - "release/1.13"
+      - "main"
 
 jobs:
   build-and-publish-latest:
@@ -48,13 +48,13 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ghcr.io/astriaorg/go-ethereum
+            ghcr.io/astriaorg/astria-geth
           tags: |
             type=ref,event=pr
-            type=match,pattern=geth1.13-v(.*),group=1
+            type=match,pattern=v(.*),group=1
             type=sha
             # set latest tag for `astria` branch
-            type=raw,value=geth1.13-latest,enable=${{ github.ref == format('refs/heads/{0}', 'release/1.13') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
@@ -63,7 +63,7 @@ jobs:
           provenance: false
           context: .
           # It takes a long time to build the arm image right now, so we only build it on tags which is what we use for releases, or on merges to the default branch.
-          platforms: ${{ (contains(github.ref, 'refs/tags/geth1.13-v') || github.ref == 'refs/heads/release/1.13') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          platforms: ${{ (contains(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}