Merge pull request #1632 from pi-hole/build-scripts-once-v6-in-dev

Final changes for merge to `development`
pi-hole · Sep 2, 2024 · d00f17f · d00f17f
2 parents b012c80 + 9e39ed3
commit d00f17f
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 199 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-`{Please select 'base: dev' as target branch above! (you can delete this line)}`
+`{Please select 'base: development' as target branch above! (you can delete this line)}`
 
 <!--- Provide a general summary of your changes in the Title above -->
 

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,7 +7,7 @@ updates:
       interval: "weekly"
       day: saturday
       time: "10:00"
-    target-branch: dev
+    target-branch: development
     reviewers:
       - "pi-hole/docker-maintainers"
   - package-ecosystem: "docker"
@@ -16,7 +16,7 @@ updates:
       interval: "weekly"
       day: saturday
       time: "10:00"
-    target-branch: dev
+    target-branch: development
     reviewers:
       - "pi-hole/docker-maintainers"
   - package-ecosystem: pip
@@ -26,35 +26,6 @@ updates:
       day: saturday
       time: "10:00"
     open-pull-requests-limit: 10
-    target-branch: dev
+    target-branch: development
     reviewers:
-      - "pi-hole/docker-maintainers"
-  # Maintain dependencies for GitHub Actions development-v6
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: saturday
-      time: "10:00"
-    target-branch: development-v6
-    reviewers:
-      - "pi-hole/docker-maintainers"
-  - package-ecosystem: "docker"
-    directory: "/src/"
-    schedule:
-      interval: "weekly"
-      day: saturday
-      time: "10:00"
-    target-branch: development-v6
-    reviewers:
-      - "pi-hole/docker-maintainers"
-  - package-ecosystem: pip
-    directory: "/test"
-    schedule:
-      interval: weekly
-      day: saturday
-      time: "10:00"
-    open-pull-requests-limit: 10
-    target-branch: development-v6
-    reviewers:
-      - "pi-hole/docker-maintainers"
+      - "pi-hole/docker-maintainers"
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -1,14 +1,18 @@
-name: Build and Publish (development-v6)
+name: Build Image and Publish
 on:
   schedule:
     - cron: "0 5 * * *"
   push:
     branches:
-      - development-v6
+      - development
+  release:
+    types: [published]
+
 
 env:
   dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole
   ghcr: ghcr.io/${{ github.repository_owner }}/pihole
+  components_branch: ${{ startsWith(github.ref, 'refs/tags/') && 'master' || 'development' }}  
 
 jobs:
   build:
@@ -29,7 +33,14 @@ jobs:
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
 
       - name: Checkout Repo
+        if: github.event_name != 'schedule'
+        uses: actions/checkout@v4
+
+      - name: Checkout dev branch if scheduled
+        if: github.event_name == 'schedule'
         uses: actions/checkout@v4
+        with:
+          ref: development
 
       - name: Docker meta
         id: meta
@@ -40,9 +51,11 @@ jobs:
             ${{ env.dockerhub }}
             ${{ env.ghcr }}            
           flavor: |
-            latest=false
+            latest=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            development-v6
+            type=schedule,pattern=nightly
+            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
+            type=ref,event=tag
 
       - name: Login to DockerHub and GitHub Container Registry
         uses: ./.github/actions/login-repo
@@ -68,7 +81,11 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
-            alpine_version=${{ matrix.alpine_version }}
+            alpine_version=${{ matrix.alpine_version }}            
+            FTL_BRANCH=${{ env.components_branch }}
+            CORE_BRANCH=${{ env.components_branch }}
+            WEB_BRANCH=${{ env.components_branch }}            
+            PADD_BRANCH=${{ env.components_branch }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: |
             type=image,name=${{ env.dockerhub }},push-by-digest=true,name-canonical=true,push=true
@@ -96,8 +113,15 @@ jobs:
       - build
     steps:
       - name: Checkout Repo
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
+      - name: Checkout dev branch if scheduled
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: development
+
       - name: Download digests
         uses: actions/download-artifact@v4
         with:
@@ -117,9 +141,11 @@ jobs:
             ${{ env.dockerhub }}
             ${{ env.ghcr }}
           flavor: |
-            latest=false
+            latest=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            development-v6
+            type=schedule,pattern=nightly
+            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
+            type=ref,event=tag
 
       - name: Login to DockerHub and GitHub Container Registry
         uses: ./.github/actions/login-repo

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,4 +1,4 @@
-name: Build and Test (development-v6)
+name: Build Image and Test
 on:
   pull_request:
 
@@ -11,7 +11,9 @@ jobs:
         # Official docker images for docker are only available for amd64 and arm64
         # TODO: Look at: https://github.com/docker-library/official-images#architectures-other-than-amd64
         # Is testing on all platforms really necessary?
-        platform: [linux/amd64, linux/arm64]
+        # Disabled arm64 tests for the time being, something is wrong with the test config and the volumes are getting shared between the test containers on different architectures
+        #platform: [linux/amd64, linux/arm64]
+        platform: [linux/amd64]
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v4

diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
@@ -13,6 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Opening pull request
-        run: gh pr create -B dev -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
+        run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,8 +2,8 @@
 
 Please review the following before opening a pull request (PR) to help your PR go smoothly:
 
-* Code changes go to the `dev` branch first
-  * To ensure proper testing and quality control, target any code change pull requests against `dev` branch.
+* Code changes go to the `development` branch first
+  * To ensure proper testing and quality control, target any code change pull requests against `development` branch.
 
 * Make sure the tests pass
   * Take a look at [TESTING.md](test/TESTING.md) to see how to run tests locally so you do not have to push all your code to a PR and have GitHub Actions run it.

diff --git a/README.md b/README.md
@@ -175,9 +175,9 @@ The Date-based (including incremented "Patch" versions) do not relate to any kin
 | `latest`            | Always latest release                                                                                                                      |
 | `2022.04.0`         | Date-based release                                                                                                                         |
 | `2022.04.1`         | Second release in a given month                                                                                                            |
-| `dev`               | Similar to `latest`, but for the development branch (pushed occasionally)                                                                  |
+| `development`               | Similar to `latest`, but for the development branch (pushed occasionally)                                                                  |
 | `*beta`             | Early beta releases of upcoming versions - here be dragons                                                                                 |
-| `nightly`           | Like `dev` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL)      |
+| `nightly`           | Like `development` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL)      |
 
 ## Upgrading, Persistence, and Customizations
 

diff --git a/src/Dockerfile b/src/Dockerfile
@@ -5,11 +5,11 @@ FROM alpine:${alpine_version} AS base
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 
 ARG TARGETPLATFORM
-ARG WEB_BRANCH="development-v6"
-ARG CORE_BRANCH="development-v6"
-ARG FTL_BRANCH="development-v6"
+ARG WEB_BRANCH="development"
+ARG CORE_BRANCH="development"
+ARG FTL_BRANCH="development"
 ARG PIHOLE_DOCKER_TAG="dev-localbuild"
-ARG PADD_BRANCH="PADD_FTLv6"
+ARG PADD_BRANCH="development"
 
 ENV DNSMASQ_USER=pihole
 ENV FTL_CMD=no-daemon