docs: fix comment order in aptly.conf

Add AptlyPilot to integrations

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           # fetch the whole repo for `git describe` to work
           fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
           make docker-unit-test
           mkdir -p out/coverage
           mv unit.out out/coverage/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: unit-tests-coverage
           path: out/
@@ -60,7 +60,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends graphviz gnupg2 gpgv2 git gcc make devscripts python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage python3-etcd3 python3-plyvel flake8 faketime dput-ng
 
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           # fetch the whole repo for `git describe` to work
           fetch-depth: 0
@@ -77,7 +77,7 @@ jobs:
         id: goversion
 
       - name: "Setup Go"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.goversion.outputs.GOVER }}
 
@@ -108,7 +108,7 @@ jobs:
           mkdir -p out/coverage
           COVERAGE_DIR=$PWD/out/coverage make system-test
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: system-tests-coverage
           path: out/
@@ -123,15 +123,15 @@ jobs:
       - test
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: "Download Unit Test Coverage"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: unit-tests-coverage
 
       - name: "Download System Test Coverage"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: system-tests-coverage
 
@@ -158,7 +158,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: ["Debian 13/trixie", "Debian 12/bookworm", "Debian 11/bullseye", "Ubuntu 26.04", "Ubuntu 24.04", "Ubuntu 22.04", "Ubuntu 20.04"]
+        name: ["Debian 13/trixie", "Debian 12/bookworm", "Ubuntu 26.04", "Ubuntu 24.04", "Ubuntu 22.04", "Ubuntu 20.04"]
         arch: ["amd64", "i386" , "arm64" , "armhf"]
         include:
           - name: "Debian 13/trixie"
@@ -167,9 +167,6 @@ jobs:
           - name: "Debian 12/bookworm"
             suite: bookworm
             image: debian:bookworm-slim
-          - name: "Debian 11/bullseye"
-            suite: bullseye
-            image: debian:bullseye-slim
           - name: "Ubuntu 26.04"
             suite: resolute
             image: ubuntu:26.04
@@ -199,7 +196,7 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           # fetch the whole repo for `git describe` to work
           fetch-depth: 0
@@ -212,7 +209,7 @@ jobs:
         id: goversion
 
       - name: "Setup Go"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.goversion.outputs.GOVER }}
 
@@ -268,7 +265,7 @@ jobs:
 
       - name: "Upload CI Artifacts"
         if: github.ref != 'refs/heads/master' && !startsWith(github.event.ref, 'refs/tags')
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.suite }}_${{ matrix.arch }}
           path: build/
@@ -290,7 +287,7 @@ jobs:
             goarch: arm
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           # fetch the whole repo for `git describe` to work
           fetch-depth: 0
@@ -301,7 +298,7 @@ jobs:
         id: goversion
 
       - name: "Setup Go"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.goversion.outputs.GOVER }}
 
@@ -328,7 +325,7 @@ jobs:
           make binaries GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }}
 
       - name: "Upload Artifacts"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: startsWith(github.event.ref, 'refs/tags')
         with:
           name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }}
@@ -336,7 +333,7 @@ jobs:
           compression-level: 0 # no compression
 
       - name: "Upload CI Artifacts"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: "!startsWith(github.event.ref, 'refs/tags')"
         with:
           name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }}
@@ -352,7 +349,7 @@ jobs:
     if: startsWith(github.event.ref, 'refs/tags')
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: "Get aptly version"
         env:
@@ -364,7 +361,7 @@ jobs:
         id: releaseversion
 
       - name: "Download Artifacts"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: out/
 

.github/workflows/golangci-lint.yml

@@ -15,7 +15,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: "Read go version from go.mod"
         run: |
@@ -23,7 +23,7 @@ jobs:
         id: goversion
 
       - name: "Setup Go"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.goversion.outputs.GOVER }}
 

README.rst

@@ -126,6 +126,10 @@ GUI for aptly API:
 
 -   `Python aptly GUI (via pyqt5) <https://github.com/chnyda/python-aptly-gui>`_ by Cedric Hnyda
 
+Repository management:
+
+-   `AptlyPilot <https://github.com/mmayabi/AptlyPilot>`_ by Maryam Mayabi  -  Web-based management platform for Aptly repositories with Repository as Code workflows and lifecycle automation.
+
 Scala sbt:
 
 -   `sbt aptly plugin <https://github.com/amalakar/sbt-aptly>`_ by Arup Malakar

Releasing.md

@@ -16,3 +16,4 @@ git push origin v$version master
 - update version in content/download.md
 - push commit to master
 - create release announcement on https://github.com/aptly-dev/aptly/discussions
+- update aptly infrastructure

api/gpg.go

@@ -141,7 +141,7 @@ func apiGPGAddKey(c *gin.Context) {
 // @Description Returns all public keys currently installed in the aptly GPG keyring.
 // @Description
 // @Tags Mirrors
-// @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)" example(trustedkeys.gpg)
+// @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)"
 // @Produce json
 // @Success 200 {object} gpgKeyListResponse "OK"
 // @Failure 400 {object} Error "Bad Request"

debian/aptly.conf

@@ -185,18 +185,6 @@ filesystem_publish_endpoints:
     #     # * size (compare file size)
     #     verify_method: md5
 
-# S3 Endpoint Support
-#
-# cloud storage). First, publishing
-# endpoints should be described in aptly configuration file. Each endpoint has name
-# and associated settings.
-#
-# In order to publish to S3, specify endpoint as `s3:endpoint-name:` before
-# publishing prefix on the command line, e.g.:
-#
-#   `aptly publish snapshot wheezy-main s3:test:`
-#
-
 # JFrog Artifactory Endpoint Support
 #
 # aptly can be configured to publish repositories directly to JFrog Artifactory. First,
@@ -225,6 +213,17 @@ jfrog_publish_endpoints:
     #     api_key: api_key
     #     access_token: access_token
 
+# S3 Endpoint Support
+#
+# cloud storage). First, publishing
+# endpoints should be described in aptly configuration file. Each endpoint has name
+# and associated settings.
+#
+# In order to publish to S3, specify endpoint as `s3:endpoint-name:` before
+# publishing prefix on the command line, e.g.:
+#
+#   `aptly publish snapshot wheezy-main s3:test:`
+#
 s3_publish_endpoints:
     # # Endpoint Name
     # test:

go.mod

@@ -1,6 +1,6 @@
 module github.com/aptly-dev/aptly
 
-go 1.25.0
+go 1.26
 
 require (
 	github.com/AlekSi/pointer v1.1.0

system/Dockerfile

@@ -2,7 +2,7 @@ FROM debian:trixie-slim
 
 RUN echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list && \
     apt-get update -y && apt-get install -y --no-install-recommends curl gnupg bzip2 xz-utils ca-certificates vim procps \
-        golang-1.25 golang-1.25-go golang-1.25-src \
+        golang-1.26 golang-1.26-go golang-1.26-src \
         make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto3 python3-azure-storage \
         g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \
         binutils-arm-linux-gnueabihf bash-completion zip ruby-dev lintian npm \
@@ -10,8 +10,8 @@ RUN echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sou
         gcc-i686-linux-gnu gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu \
         faketime dput-ng && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
-    ln -sf /usr/lib/go-1.25/bin/go /usr/local/bin/go && \
-    ln -sf /usr/lib/go-1.25/bin/gofmt /usr/local/bin/gofmt
+    ln -sf /usr/lib/go-1.26/bin/go /usr/local/bin/go && \
+    ln -sf /usr/lib/go-1.26/bin/gofmt /usr/local/bin/gofmt
 
 RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly
 RUN sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /var/lib/aptly/.bashrc