Merge pull request #4693 from oasisprotocol/kostko/feature/rust-bump-…

…deps Bump dependencies and toolchains
oasisprotocol · Apr 25, 2022 · fc7215b · fc7215b
2 parents 38286f0 + f798040
commit fc7215b
Show file tree

Hide file tree

Showing 23 changed files with 315 additions and 257 deletions.
diff --git a/.changelog/4693.internal.md b/.changelog/4693.internal.md
@@ -0,0 +1 @@
+Bump Rust toolchain to nightly-2022-04-13, Go to 1.17.9
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -73,8 +73,8 @@ jobs:
       - name: "Rebuild oasisprotocol/oasis-core-dev:${{ steps.determine_tag.outputs.tag }}"
         uses: docker/[email protected]
         with:
-          context: docker/development
-          file: docker/development/Dockerfile
+          context: docker/oasis-core-dev
+          file: docker/oasis-core-dev/Dockerfile
           tags: oasisprotocol/oasis-core-dev:${{ steps.determine_tag.outputs.tag }}
           pull: true
           push: true
@@ -86,8 +86,8 @@ jobs:
       - name: "Rebuild oasisprotocol/oasis-core-ci:${{ steps.determine_tag.outputs.tag }}"
         uses: docker/[email protected]
         with:
-          context: docker/testing
-          file: docker/testing/Dockerfile
+          context: docker/oasis-core-ci
+          file: docker/oasis-core-ci/Dockerfile
           tags: oasisprotocol/oasis-core-ci:${{ steps.determine_tag.outputs.tag }}
           pull: true
           push: true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bump Rust toolchain to nightly-2022-04-13, Go to 1.17.9