vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

New signing key for aptly repo, and small fixes

Browse Source 
Build on Go 1.10, drop Go 1.7

Remove references to now defunct pgp.mit.edu, fix system test
This commit is contained in:
Andrey Smirnov
2018-03-16 01:25:38 +03:00
parent 581876df9a
commit aa3a2ab595
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -4,9 +4,9 @@ sudo: required
language: go language: go
go: go:
- 1.7.x
- 1.8.x - 1.8.x
- 1.9.x - 1.9.x
- 1.10.x
- master - master
go_import_path: github.com/smira/aptly go_import_path: github.com/smira/aptly
Makefile
+1 -1
View File
@@ -54,7 +54,7 @@ system/env: system/requirements.txt
system-test: install system/env system-test: install system/env
if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi
if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi
. system/env/bin/activate && APTLY_VERSION=$(VERSION) PATH=$(BINPATH)/:$(PATH) $(PYTHON) system/run.py --long $(TESTS) PATH=$(BINPATH)/:$(PATH) && . system/env/bin/activate && APTLY_VERSION=$(VERSION) $(PYTHON) system/run.py --long $(TESTS)
travis: $(TRAVIS_TARGET) check system-test travis: $(TRAVIS_TARGET) check system-test
README.rst
+2 -2
View File
@@ -48,7 +48,7 @@ To install aptly on Debian/Ubuntu, add new repository to ``/etc/apt/sources.list
And import key that is used to sign the release:: And import key that is used to sign the release::
$ apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460 $ apt-key adv --keyserver pool.sks-keyservers.net --recv-keys ED75B5A4483DA07C
After that you can install aptly as any other software package:: After that you can install aptly as any other software package::
@@ -64,7 +64,7 @@ If you would like to use nightly builds (unstable), please use following reposit
Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_. Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
If you have Go environment set up, you can build aptly from source by running (go 1.7+ required):: If you have Go environment set up, you can build aptly from source by running (go 1.8+ required)::
mkdir -p $GOPATH/src/github.com/smira/aptly mkdir -p $GOPATH/src/github.com/smira/aptly
git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly
pgp/gnupg.go
+1 -1
View File
@@ -229,7 +229,7 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
keys[i] = string(result.MissingKeys[i]) keys[i] = string(result.MissingKeys[i])
} }
fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver keys.gnupg.net --recv-keys %s\n\n", fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver pool.sks-keyservers.net --recv-keys %s\n\n",
strings.Join(keys, " ")) strings.Join(keys, " "))
fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n") fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n")
pgp/internal.go
+1 -1
View File
@@ -334,7 +334,7 @@ func (g *GoVerifier) showImportKeyTip(signers []signatureResult) {
keys = append(keys, string(KeyFromUint64(signer.IssuerKeyID))) keys = append(keys, string(KeyFromUint64(signer.IssuerKeyID)))
} }
fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver keys.gnupg.net --recv-keys %s\n\n", fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver pool.sks-keyservers.net --recv-keys %s\n\n",
strings.Join(keys, " ")) strings.Join(keys, " "))
fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n") fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n")
system/t04_mirror/UpdateMirror22Test_gold
+1 -1
View File
@@ -4,7 +4,7 @@ openpgp: Good signature from "NVIDIA CORPORATION (Open Source Projects) <cudatoo
Downloading & parsing package files... Downloading & parsing package files...
Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz... Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz...
Applying filter... Applying filter...
Packages filtered: 12 -> 0. Packages filtered: 16 -> 0.
Building download queue... Building download queue...
Download queue: 0 items (0 B) Download queue: 0 items (0 B)