Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to a newer Circle CI convenience image #123

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move to a newer Circle CI convenience image #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81f772
Move to a newer Circle CI convenience image
PeterJCLaw Sep 24, 2022
ae37ef6
CIRCLE_JOB is the new CIRCLE_STAGE
PeterJCLaw Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ references:
restore-build-dependency-cache: &restore-build-dependency-cache
restore_cache:
name: Restore build dependency cache
key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
key: deps-venv-1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum ".circleci/requirements.txt" }}

install-build-dependencies: &install-build-dependencies
run:
Expand All @@ -35,7 +35,7 @@ references:
save-build-dependency-cache: &save-build-dependency-cache
save_cache:
name: Save build dependency cache
key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
key: deps-venv-1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum ".circleci/requirements.txt" }}
paths:
- "venv"

Expand Down Expand Up @@ -70,15 +70,15 @@ references:
done
- restore_cache:
name: Restore .tox cache
key: deps-tox-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".checksum" }}
key: deps-tox-1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum ".checksum" }}
- run:
name: Test
command: |
. venv/bin/activate
tox
- save_cache:
name: Save .tox cache
key: deps-tox-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".checksum" }}
key: deps-tox-1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum ".checksum" }}
paths:
- ".tox"

Expand All @@ -99,7 +99,7 @@ jobs:
test-36:
<<: *test-template
docker:
- image: circleci/python:3.6
- image: cimg/python:3.6
environment:
<<: *steps-environment
TOXENV: py36
Expand All @@ -110,7 +110,7 @@ jobs:
test-37:
<<: *test-template
docker:
- image: circleci/python:3.7
- image: cimg/python:3.7
environment:
<<: *steps-environment
TOXENV: py37
Expand All @@ -121,7 +121,7 @@ jobs:
test-38:
<<: *test-template
docker:
- image: circleci/python:3.8
- image: cimg/python:3.8
environment:
<<: *steps-environment
TOXENV: py38
Expand All @@ -132,7 +132,7 @@ jobs:
test-39:
<<: *test-template
docker:
- image: circleci/python:3.9
- image: cimg/python:3.9
environment:
<<: *steps-environment
TOXENV: py39
Expand All @@ -143,7 +143,7 @@ jobs:
test-310:
<<: *test-template
docker:
- image: circleci/python:3.10
- image: cimg/python:3.10
environment:
<<: *steps-environment
TOXENV: py310
Expand All @@ -154,7 +154,7 @@ jobs:
lint:
working_directory: ~/routemaster
docker:
- image: circleci/python:3.6.3
- image: cimg/python:3.6
steps:
- checkout

Expand All @@ -164,15 +164,15 @@ jobs:

- restore_cache:
name: Restore .tox cache
key: deps-tox-{{ checksum "scripts/linting/requirements.txt" }}
key: deps-tox-1-{{ checksum "scripts/linting/requirements.txt" }}
- run:
name: Lint
command: |
. venv/bin/activate
TOXENV=lint tox
- save_cache:
name: Save .tox cache
key: deps-tox-{{ checksum "scripts/linting/requirements.txt" }}
key: deps-tox-1-{{ checksum "scripts/linting/requirements.txt" }}
paths:
- ".tox"
- store_test_results:
Expand All @@ -181,7 +181,7 @@ jobs:
typecheck:
working_directory: ~/routemaster
docker:
- image: circleci/python:3.6.3
- image: cimg/python:3.6
steps:
- checkout

Expand All @@ -191,15 +191,15 @@ jobs:

- restore_cache:
name: Restore .tox cache
key: deps-tox-{{ checksum "scripts/typechecking/requirements.txt" }}
key: deps-tox-1-{{ checksum "scripts/typechecking/requirements.txt" }}
- run:
name: Typecheck
command: |
. venv/bin/activate
TOXENV=mypy tox
- save_cache:
name: Save .tox cache
key: deps-tox-{{ checksum "scripts/typechecking/requirements.txt" }}
key: deps-tox-1-{{ checksum "scripts/typechecking/requirements.txt" }}
paths:
- ".tox"
- store_test_results:
Expand All @@ -208,7 +208,7 @@ jobs:
release:
working_directory: ~/routemaster
docker:
- image: circleci/python:3.6.3
- image: cimg/python:3.6
steps:
- checkout

Expand Down