chore: remove duplication

Author: Naramsim

.github/FUNDING.yml

@@ -1,12 +1 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
 open_collective: pokeapi
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/database.yml

@@ -76,19 +76,14 @@ jobs:
         with:
           submodules: recursive
       - name: Build and start services
-        run: |
-          docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d --build
+        run: make docker-dev-up
       - name: Run migrations and build database
         run: |
           make docker-migrate
           make docker-build-db
       - name: Dump DB
-        run: docker compose exec -T db pg_dump -U ash -Fc -N 'hdb_*' pokeapi > pokeapi.dump
-      - name: Drop and recreate database
-        run: |
-          docker compose exec -T db psql -U ash -d postgres -c "DROP DATABASE pokeapi WITH (FORCE);"
-          docker compose exec -T db psql -U ash -d postgres -c "CREATE DATABASE pokeapi;"
+        run: make docker-dump-db
       - name: Import database
-        run: docker compose exec -T db pg_restore -U ash -d pokeapi < pokeapi.dump
+        run: make docker-restore-db
       - name: Test data
         run: curl -Ss http://localhost/api/v2/pokemon/1/ | grep -q 'bulbasaur'

.github/workflows/docker-k8s.yml

@@ -118,8 +118,8 @@ jobs:
         uses: actions/checkout@v6
       - name: Build dev environment
         run: |
-          docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d
-          sleep 30
+          make docker-dev-up
+          sleep 5
       - name: Assert containers running
         run: |
           last_command=$(docker ps | grep 'pokeapi-' | wc -l)

.github/workflows/release.yml

@@ -23,18 +23,16 @@ jobs:
           submodules: recursive
       - name: Start pokeapi (docker)
         run: |
-          docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d
+          make docker-dev-up
           make docker-migrate
           make docker-build-db
       - name: Dump PG db
-        run: docker compose exec -T -u postgres db sh -c "cd /tmp && pg_dump -h localhost -Fc -U ash -N 'hdb_*' pokeapi > pokeapi.pgdump"
-      - name: Copy PG dump
-        run: |
-          docker compose cp db:/tmp/pokeapi.pgdump ./
-          ls -larth
+        run: make docker-dump-db
+      - name: List folder
+        run: ls -larth
       - name: Setup uv
         uses: ./.github/actions/setup-uv
-      - name: Start pokeapi
+      - name: Generate SQLite db
         run: |
           rm -rf .venv
           make install-base
@@ -43,7 +41,7 @@ jobs:
           nohup make serve &
           sleep 3
       - name: Release tag
-        uses: softprops/action-gh-release@v3.0.1
+        uses: softprops/action-gh-release@v3.0.2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           draft: true
@@ -53,7 +51,7 @@ jobs:
             db.sqlite3
           generate_release_notes: true
       - name: Release master branch
-        uses: softprops/action-gh-release@v3.0.1
+        uses: softprops/action-gh-release@v3.0.2
         if: github.ref == 'refs/heads/master'
         with:
           body: |

Makefile

@@ -62,6 +62,9 @@ openapi-generate: check-uv
 docker-up:  # (Docker) Create services/volumes/networks
 	docker compose up -d
 
+docker-dev-up:  # (Docker) Build local pokeapi image and create services/volumes/networks
+	docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d --build
+
 docker-migrate:  # (Docker) Run any pending migrations
 	docker compose exec -T app python manage.py migrate ${docker_config}
 
@@ -95,6 +98,14 @@ docker-prod:
 
 docker-setup: docker-up docker-migrate docker-build-db  # (Docker) Start services, prepare the latest DB schema, populate the DB
 
+docker-dump-db:
+	docker compose exec -T db pg_dump -U ash -Fc -N 'hdb_*' pokeapi > pokeapi.pgdump
+
+docker-restore-db:
+	docker compose exec -T db psql -U ash -d postgres -c "DROP DATABASE pokeapi WITH (FORCE);"
+	docker compose exec -T db psql -U ash -d postgres -c "CREATE DATABASE pokeapi;"
+	docker compose exec -T db pg_restore -U ash -d pokeapi < pokeapi.pgdump
+
 format: check-uv   # Format the source code
 	uv run ruff format .