Update various evolutions (poketwo#309)

Spongey-s-Side-Projects · Oct 2, 2021 · d6466b1 · d6466b1
1 parent 7d85dfc
commit d6466b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -3,7 +3,7 @@ name: Docker Image CI
 on:
   push:
     branches:
-      - master
+      - "*"
 
 jobs:
   build:
@@ -14,12 +14,14 @@ jobs:
           token: ${{ secrets.GHCR_PAT }}
           submodules: true
 
-      - uses: nelonoel/[email protected]
+      - name: Prepare Environment
+        uses: nelonoel/[email protected]
+
       - name: Publish Image
         uses: whoan/docker-build-with-cache-action@v5
         with:
           username: poketwo
           password: ${{ secrets.GHCR_PAT }}
           registry: ghcr.io
           image_name: poketwo
-          image_tag: latest,${{ github.sha }}
+          image_tag: latest,${{ env.BRANCH_NAME }},${{ github.sha }}
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "data"]
 	path = data
-	url = https://github.com/poketwo/data-private.git
+	url = https://github.com/poketwo/data.git
diff --git a/data b/data
+13 −22		csv/evolution.csv
+1 −0		csv/items.csv
+16 −16		csv/pokemon.csv