diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 3239ca5c5..2f6e51908 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Spell-Checking uses: codespell-project/actions-codespell@master diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index bb6cf5864..26ef7fefa 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -8,10 +8,10 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry with PAT_TOKEN - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9d688b25a..e89a09de2 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.4.0 + uses: actions/checkout@v4 - name: Remove 'stale' label run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }} env: diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index 70a5c1ca1..fb0e83148 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -11,7 +11,7 @@ jobs: name: Syncing branches steps: - name: Checkout - uses: actions/checkout@v3.1.0 + 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' env: diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index 47c3c97fb..5d5edc78a 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -32,13 +32,13 @@ jobs: container: edge steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: development-v6 - name: Docker meta (Docker Hub and GitHub Container Registry) id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | @@ -58,15 +58,15 @@ jobs: ghcr_password: ${{ secrets.GITHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: all - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build container and push by digest (${{ matrix.registry }}) id: build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: ./src/ platforms: ${{ matrix.platform }} @@ -105,7 +105,7 @@ jobs: - build-and-test steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: development-v6 @@ -116,7 +116,7 @@ jobs: path: /tmp/digests - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub and GitHub Container Registry uses: ./.github/actions/login-repo @@ -128,7 +128,7 @@ jobs: - name: Docker meta (Docker Hub and GitHub Container Registry) id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index f9c99bd09..9c65e20b5 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Tests run: | echo "Building image to test" @@ -29,23 +29,23 @@ jobs: - name: Checkout if: github.event_name != 'schedule' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout dev branch if we are building nightly if: github.event_name == 'schedule' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: dev - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | @@ -59,20 +59,20 @@ jobs: type=ref,event=tag - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: ./src/ platforms: linux/amd64, linux/arm64, linux/386, linux/arm/v7, linux/arm/v6 diff --git a/README.md b/README.md index 22083e9dd..a194e955e 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ The Date-based (including incremented "Patch" versions) do not relate to any kin | `2022.04.1` | Second release in a given month | | `dev` | 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, AdminLTE, FTL) | +| `nightly` | Like `dev` 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/s6/debian-root/usr/local/bin/_postFTL.sh b/src/s6/debian-root/usr/local/bin/_postFTL.sh index b06cff585..d53fde68f 100755 --- a/src/s6/debian-root/usr/local/bin/_postFTL.sh +++ b/src/s6/debian-root/usr/local/bin/_postFTL.sh @@ -16,7 +16,7 @@ fi if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then if [ -n "$SKIPGRAVITYONBOOT" ];then echo " SKIPGRAVITYONBOOT is set, however ${gravityDBfile} does not exist (Likely due to a fresh volume). This is a required file for Pi-hole to operate." - echo " Ignoring SKIPGRAVITYONBOOT on this occaision." + echo " Ignoring SKIPGRAVITYONBOOT on this occasion." fi pihole -g else