chore: don't unpin the rust version (#455)

plus fix CI's rust version to match Dockerfile's and improve the comment warning about this test: bump contile's user-agent
mozilla-services · Oct 3, 2022 · d9e6b45 · d9e6b45
1 parent 16c1c85
commit d9e6b45
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,15 +5,19 @@
 # DOCKER_PASS
 #
 version: 2.1
+
+parameters:
+  rust-version:
+    type: string
+    # NOTE: Ensure this Rust version matches the builder's in ../Dockerfile
+    default: "1.64"
+
 commands:
   setup-rust:
     steps:
       - run:
           name: Setup Rust
           command: |
-            rustup install stable
-            rustup default stable
-            rustup update
             rustc --version
   setup-rust-check:
     steps:
@@ -87,7 +91,7 @@ commands:
 jobs:
   checks:
     docker:
-      - image: cimg/rust:1.62
+      - image: cimg/rust:<< pipeline.parameters.rust-version >>
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
@@ -100,7 +104,7 @@ jobs:
 
   test:
     docker:
-      - image: cimg/rust:1.62
+      - image: cimg/rust:<< pipeline.parameters.rust-version >>
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
@@ -116,7 +120,7 @@ jobs:
 
   build:
     docker:
-      - image: cimg/rust:1.62
+      - image: cimg/rust:<< pipeline.parameters.rust-version >>
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 # Change this to be your application's name
 ARG APPNAME=contile
 
-# make sure that the build and run environments are the same version
+# NOTE: Ensure builder's Rust version matches CI's in .circleci/config.yml
 FROM rust:1.64-slim-buster as builder
 ARG APPNAME
 ADD . /app

diff --git a/test-engineering/contract-tests/volumes/client/scenarios.yml b/test-engineering/contract-tests/volumes/client/scenarios.yml
@@ -498,7 +498,7 @@ scenarios:
                     - name: accept
                       value: '*/*'
                     - name: user-agent
-                      value: 'contile/1.8.0'
+                      value: 'contile/1.8.1'
                     - name: host
                       value: 'partner:5000'
                   path: '/tilesp/desktop'

diff --git a/test-engineering/contract-tests/volumes/client/scenarios_tiles_cache.yml b/test-engineering/contract-tests/volumes/client/scenarios_tiles_cache.yml
@@ -88,7 +88,7 @@ scenarios:
                     - name: accept
                       value: '*/*'
                     - name: user-agent
-                      value: 'contile/1.8.0'
+                      value: 'contile/1.8.1'
                     - name: host
                       value: 'partner:5000'
                   path: '/tilesp/desktop'
@@ -201,7 +201,7 @@ scenarios:
                     - name: accept
                       value: '*/*'
                     - name: user-agent
-                      value: 'contile/1.8.0'
+                      value: 'contile/1.8.1'
                     - name: host
                       value: 'partner:5000'
                   path: '/tilesp/desktop'
@@ -235,7 +235,7 @@ scenarios:
                     - name: accept
                       value: '*/*'
                     - name: user-agent
-                      value: 'contile/1.8.0'
+                      value: 'contile/1.8.1'
                     - name: host
                       value: 'partner:5000'
                   path: '/tilesp/desktop'