Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Bump Nix image to 22.05

Browse source
This commit is contained in:
Quentin 2022-07-24 11:08:02 +02:00 committed by Alex Auvolat
parent 4279ca95eb
commit ac98769009
Signed by: lx
GPG key ID: 0E496D15096376BE
2 changed files with 63 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
.drone.yml
View file

@ -16,30 +16,41 @@ environment:
HOME: /drone/garage HOME: /drone/garage
steps: steps:
- name: setup nix - name: nix maintainance
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes:
- name: nix_store
path: /mnt
- name: nix_config
path: /etc/nix
commands:
- "[ -d /mnt/store/3vpyn2qz5ay057nq9x68sh0r328d77ng-nix-2.8.1/ ] || (mkdir -p /mnt/store && cp -r /nix/store/* /mnt/store/)"
- "[ -d /mnt/var/ ] || cp -r /nix/var /mnt/"
- cp nix/nix.conf /etc/nix/nix.conf
- name: warmup cache
image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
- name: nix_config - name: nix_config
path: /etc/nix path: /etc/nix
commands: commands:
- cp nix/nix.conf /etc/nix/nix.conf - nix-build --no-build-output --no-out-link shell.nix -A rust.inputDerivation -A integration.inputDerivation -A release.inputDerivation
- nix-build --no-build-output --no-out-link shell.nix --arg release false -A inputDerivation
- name: code quality - name: code quality
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
- name: nix_config - name: nix_config
path: /etc/nix path: /etc/nix
commands: commands:
- nix-shell --arg release false --run "cargo fmt -- --check" - nix-shell --attr rust --run "cargo fmt -- --check"
- nix-shell --arg release false --run "cargo clippy -- --deny warnings" - nix-shell --attr rust --run "cargo clippy -- --deny warnings"
- name: build - name: build
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -50,7 +61,7 @@ steps:
- nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage" - nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
- name: unit + func tests - name: unit + func tests
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
environment: environment:
GARAGE_TEST_INTEGRATION_EXE: result/bin/garage GARAGE_TEST_INTEGRATION_EXE: result/bin/garage
volumes: volumes:
@ -75,7 +86,7 @@ steps:
- ./result/bin/integration-* - ./result/bin/integration-*
- name: smoke-test - name: smoke-test
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -83,7 +94,7 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- nix-build --no-build-output --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT - nix-build --no-build-output --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT
- nix-shell --arg release false --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
trigger: trigger:
event: event:
@ -93,9 +104,6 @@ trigger:
- tag - tag
- cron - cron
node:
nix: 1
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -113,7 +121,7 @@ environment:
steps: steps:
- name: setup nix - name: setup nix
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -121,10 +129,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- cp nix/nix.conf /etc/nix/nix.conf - cp nix/nix.conf /etc/nix/nix.conf
- nix-build --no-build-output --no-out-link shell.nix -A inputDerivation - nix-build --no-build-output --no-out-link shell.nix -A rust.inputDerivation -A integration.inputDerivation -A release.inputDerivation
- name: build - name: build
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -132,19 +140,20 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
- nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
- name: integration - name: integration
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
- name: nix_config - name: nix_config
path: /etc/nix path: /etc/nix
commands: commands:
- nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
- name: push static binary - name: push static binary
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -156,10 +165,10 @@ steps:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: garagehq_aws_secret_access_key from_secret: garagehq_aws_secret_access_key
commands: commands:
- nix-shell --arg rust false --arg integration false --run "to_s3" - nix-shell --attr release --run "to_s3"
- name: docker build and publish - name: docker build and publish
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -175,7 +184,7 @@ steps:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo $DOCKER_AUTH > /kaniko/.docker/config.json - echo $DOCKER_AUTH > /kaniko/.docker/config.json
- export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT} - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
- nix-shell --arg rust false --arg integration false --run "to_docker" - nix-shell --attr release --run "to_docker"
trigger: trigger:
@ -183,9 +192,6 @@ trigger:
- promote - promote
- cron - cron
node:
nix: 1
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -203,7 +209,7 @@ environment:
steps: steps:
- name: setup nix - name: setup nix
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -211,10 +217,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- cp nix/nix.conf /etc/nix/nix.conf - cp nix/nix.conf /etc/nix/nix.conf
- nix-build --no-build-output --no-out-link shell.nix -A inputDerivation - nix-build --no-build-output --no-out-link shell.nix -A rust.inputDerivation -A integration.inputDerivation -A release.inputDerivation
- name: build - name: build
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -222,19 +228,20 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
- nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
- name: integration - name: integration
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
- name: nix_config - name: nix_config
path: /etc/nix path: /etc/nix
commands: commands:
- nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
- name: push static binary - name: push static binary
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -246,10 +253,10 @@ steps:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: garagehq_aws_secret_access_key from_secret: garagehq_aws_secret_access_key
commands: commands:
- nix-shell --arg rust false --arg integration false --run "to_s3" - nix-shell --attr release --run "to_s3"
- name: docker build and publish - name: docker build and publish
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -265,16 +272,13 @@ steps:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo $DOCKER_AUTH > /kaniko/.docker/config.json - echo $DOCKER_AUTH > /kaniko/.docker/config.json
- export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT} - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
- nix-shell --arg rust false --arg integration false --run "to_docker" - nix-shell --attr release --run "to_docker"
trigger: trigger:
event: event:
- promote - promote
- cron - cron
node:
nix: 1
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -292,7 +296,7 @@ environment:
steps: steps:
- name: setup nix - name: setup nix
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -300,10 +304,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- cp nix/nix.conf /etc/nix/nix.conf - cp nix/nix.conf /etc/nix/nix.conf
- nix-build --no-build-output --no-out-link ./shell.nix --arg rust false --arg integration false -A inputDerivation - nix-build --no-build-output --no-out-link shell.nix -A rust.inputDerivation -A integration.inputDerivation -A release.inputDerivation
- name: build - name: build
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -311,9 +315,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
- nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
- name: push static binary - name: push static binary
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -325,10 +330,10 @@ steps:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: garagehq_aws_secret_access_key from_secret: garagehq_aws_secret_access_key
commands: commands:
- nix-shell --arg rust false --arg integration false --run "to_s3" - nix-shell --attr release --run "to_s3"
- name: docker build and publish - name: docker build and publish
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -344,16 +349,13 @@ steps:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo $DOCKER_AUTH > /kaniko/.docker/config.json - echo $DOCKER_AUTH > /kaniko/.docker/config.json
- export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT} - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
- nix-shell --arg rust false --arg integration false --run "to_docker" - nix-shell --attr release --run "to_docker"
trigger: trigger:
event: event:
- promote - promote
- cron - cron
node:
nix: 1
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -371,7 +373,7 @@ environment:
steps: steps:
- name: setup nix - name: setup nix
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -379,10 +381,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- cp nix/nix.conf /etc/nix/nix.conf - cp nix/nix.conf /etc/nix/nix.conf
- nix-build --no-build-output --no-out-link --arg rust false --arg integration false -A inputDerivation - nix-build --no-build-output --no-out-link shell.nix -A rust.inputDerivation -A integration.inputDerivation -A release.inputDerivation
- name: build - name: build
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -390,9 +392,10 @@ steps:
path: /etc/nix path: /etc/nix
commands: commands:
- nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
- nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
- name: push static binary - name: push static binary
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -404,10 +407,10 @@ steps:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: garagehq_aws_secret_access_key from_secret: garagehq_aws_secret_access_key
commands: commands:
- nix-shell --arg integration false --arg rust false --run "to_s3" - nix-shell --attr release --run "to_s3"
- name: docker build and publish - name: docker build and publish
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -423,16 +426,13 @@ steps:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo $DOCKER_AUTH > /kaniko/.docker/config.json - echo $DOCKER_AUTH > /kaniko/.docker/config.json
- export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT} - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
- nix-shell --arg rust false --arg integration false --run "to_docker" - nix-shell --attr release --run "to_docker"
trigger: trigger:
event: event:
- promote - promote
- cron - cron
node:
nix: 1
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -445,7 +445,7 @@ volumes:
steps: steps:
- name: refresh-index - name: refresh-index
image: nixpkgs/nix:nixos-21.05 image: nixpkgs/nix:nixos-22.05
volumes: volumes:
- name: nix_store - name: nix_store
path: /nix path: /nix
@ -456,7 +456,7 @@ steps:
from_secret: garagehq_aws_secret_access_key from_secret: garagehq_aws_secret_access_key
commands: commands:
- mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf
- nix-shell --arg integration false --arg rust false --run "refresh_index" - nix-shell --attr release --run "refresh_index"
depends_on: depends_on:
- release-linux-x86_64 - release-linux-x86_64
@ -469,11 +469,8 @@ trigger:
- promote - promote
- cron - cron
node:
nix: 1
--- ---
kind: signature kind: signature
hmac: 3fc19d6f9a3555519c8405e3281b2e74289bb802f644740d5481d53df3a01fa4 hmac: 12b06094741a9b6da448e3a176d2fc37b2c261ab87acefa60a070e67a55352b0
... ...

2
nix/nix.conf
View file

@ -3,3 +3,5 @@ trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDS
max-jobs = auto max-jobs = auto
cores = 4 cores = 4
log-lines = 200 log-lines = 200
filter-syscalls = false
sandbox = false