Compare commits

..
Author SHA1 Message Date
André Roth f679c54f2a doc: fix comment order in aptly.conf 2026-07-01 16:11:20 +02:00
4 changed files with 24 additions and 25 deletions

No files matched your search

+21 -18
View File
@@ -24,7 +24,7 @@ jobs:
timeout-minutes: 30 timeout-minutes: 30
steps: steps:
- name: "Checkout Repository" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
with: with:
# fetch the whole repo for `git describe` to work # fetch the whole repo for `git describe` to work
fetch-depth: 0 fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
make docker-unit-test make docker-unit-test
mkdir -p out/coverage mkdir -p out/coverage
mv unit.out out/coverage/ mv unit.out out/coverage/
- uses: actions/upload-artifact@v7 - uses: actions/upload-artifact@v4
with: with:
name: unit-tests-coverage name: unit-tests-coverage
path: out/ 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 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" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
with: with:
# fetch the whole repo for `git describe` to work # fetch the whole repo for `git describe` to work
fetch-depth: 0 fetch-depth: 0
@@ -77,7 +77,7 @@ jobs:
id: goversion id: goversion
- name: "Setup Go" - name: "Setup Go"
uses: actions/setup-go@v7 uses: actions/setup-go@v3
with: with:
go-version: ${{ steps.goversion.outputs.GOVER }} go-version: ${{ steps.goversion.outputs.GOVER }}
@@ -108,7 +108,7 @@ jobs:
mkdir -p out/coverage mkdir -p out/coverage
COVERAGE_DIR=$PWD/out/coverage make system-test COVERAGE_DIR=$PWD/out/coverage make system-test
- uses: actions/upload-artifact@v7 - uses: actions/upload-artifact@v4
with: with:
name: system-tests-coverage name: system-tests-coverage
path: out/ path: out/
@@ -123,15 +123,15 @@ jobs:
- test - test
steps: steps:
- name: "Checkout Repository" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
- name: "Download Unit Test Coverage" - name: "Download Unit Test Coverage"
uses: actions/download-artifact@v8 uses: actions/download-artifact@v4
with: with:
name: unit-tests-coverage name: unit-tests-coverage
- name: "Download System Test Coverage" - name: "Download System Test Coverage"
uses: actions/download-artifact@v8 uses: actions/download-artifact@v4
with: with:
name: system-tests-coverage name: system-tests-coverage
@@ -158,7 +158,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
name: ["Debian 13/trixie", "Debian 12/bookworm", "Ubuntu 26.04", "Ubuntu 24.04", "Ubuntu 22.04", "Ubuntu 20.04"] name: ["Debian 13/trixie", "Debian 12/bookworm", "Debian 11/bullseye", "Ubuntu 26.04", "Ubuntu 24.04", "Ubuntu 22.04", "Ubuntu 20.04"]
arch: ["amd64", "i386" , "arm64" , "armhf"] arch: ["amd64", "i386" , "arm64" , "armhf"]
include: include:
- name: "Debian 13/trixie" - name: "Debian 13/trixie"
@@ -167,6 +167,9 @@ jobs:
- name: "Debian 12/bookworm" - name: "Debian 12/bookworm"
suite: bookworm suite: bookworm
image: debian:bookworm-slim image: debian:bookworm-slim
- name: "Debian 11/bullseye"
suite: bullseye
image: debian:bullseye-slim
- name: "Ubuntu 26.04" - name: "Ubuntu 26.04"
suite: resolute suite: resolute
image: ubuntu:26.04 image: ubuntu:26.04
@@ -196,7 +199,7 @@ jobs:
git config --global --add safe.directory "$GITHUB_WORKSPACE" git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: "Checkout Repository" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
with: with:
# fetch the whole repo for `git describe` to work # fetch the whole repo for `git describe` to work
fetch-depth: 0 fetch-depth: 0
@@ -209,7 +212,7 @@ jobs:
id: goversion id: goversion
- name: "Setup Go" - name: "Setup Go"
uses: actions/setup-go@v7 uses: actions/setup-go@v3
with: with:
go-version: ${{ steps.goversion.outputs.GOVER }} go-version: ${{ steps.goversion.outputs.GOVER }}
@@ -265,7 +268,7 @@ jobs:
- name: "Upload CI Artifacts" - name: "Upload CI Artifacts"
if: github.ref != 'refs/heads/master' && !startsWith(github.event.ref, 'refs/tags') if: github.ref != 'refs/heads/master' && !startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v4
with: with:
name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.suite }}_${{ matrix.arch }} name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.suite }}_${{ matrix.arch }}
path: build/ path: build/
@@ -287,7 +290,7 @@ jobs:
goarch: arm goarch: arm
steps: steps:
- name: "Checkout Repository" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
with: with:
# fetch the whole repo for `git describe` to work # fetch the whole repo for `git describe` to work
fetch-depth: 0 fetch-depth: 0
@@ -298,7 +301,7 @@ jobs:
id: goversion id: goversion
- name: "Setup Go" - name: "Setup Go"
uses: actions/setup-go@v7 uses: actions/setup-go@v3
with: with:
go-version: ${{ steps.goversion.outputs.GOVER }} go-version: ${{ steps.goversion.outputs.GOVER }}
@@ -325,7 +328,7 @@ jobs:
make binaries GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} make binaries GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }}
- name: "Upload Artifacts" - name: "Upload Artifacts"
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v4
if: startsWith(github.event.ref, 'refs/tags') if: startsWith(github.event.ref, 'refs/tags')
with: with:
name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }} name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }}
@@ -333,7 +336,7 @@ jobs:
compression-level: 0 # no compression compression-level: 0 # no compression
- name: "Upload CI Artifacts" - name: "Upload CI Artifacts"
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v4
if: "!startsWith(github.event.ref, 'refs/tags')" if: "!startsWith(github.event.ref, 'refs/tags')"
with: with:
name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }} name: aptly_${{ steps.releaseversion.outputs.VERSION }}_${{ matrix.goos }}_${{ matrix.goarch }}
@@ -349,7 +352,7 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags') if: startsWith(github.event.ref, 'refs/tags')
steps: steps:
- name: "Checkout Repository" - name: "Checkout Repository"
uses: actions/checkout@v7 uses: actions/checkout@v4
- name: "Get aptly version" - name: "Get aptly version"
env: env:
@@ -361,7 +364,7 @@ jobs:
id: releaseversion id: releaseversion
- name: "Download Artifacts" - name: "Download Artifacts"
uses: actions/download-artifact@v8 uses: actions/download-artifact@v4
with: with:
path: out/ path: out/
+2 -2
View File
@@ -15,7 +15,7 @@ jobs:
name: lint name: lint
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v4
- name: "Read go version from go.mod" - name: "Read go version from go.mod"
run: | run: |
@@ -23,7 +23,7 @@ jobs:
id: goversion id: goversion
- name: "Setup Go" - name: "Setup Go"
uses: actions/setup-go@v7 uses: actions/setup-go@v3
with: with:
go-version: ${{ steps.goversion.outputs.GOVER }} go-version: ${{ steps.goversion.outputs.GOVER }}
-4
View File
@@ -126,10 +126,6 @@ GUI for aptly API:
- `Python aptly GUI (via pyqt5) <https://github.com/chnyda/python-aptly-gui>`_ by Cedric Hnyda - `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: Scala sbt:
- `sbt aptly plugin <https://github.com/amalakar/sbt-aptly>`_ by Arup Malakar - `sbt aptly plugin <https://github.com/amalakar/sbt-aptly>`_ by Arup Malakar
+1 -1
View File
@@ -141,7 +141,7 @@ func apiGPGAddKey(c *gin.Context) {
// @Description Returns all public keys currently installed in the aptly GPG keyring. // @Description Returns all public keys currently installed in the aptly GPG keyring.
// @Description // @Description
// @Tags Mirrors // @Tags Mirrors
// @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)" // @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)" example(trustedkeys.gpg)
// @Produce json // @Produce json
// @Success 200 {object} gpgKeyListResponse "OK" // @Success 200 {object} gpgKeyListResponse "OK"
// @Failure 400 {object} Error "Bad Request" // @Failure 400 {object} Error "Bad Request"