diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db91b3..d690dad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: Build and Push Backend Docker Image - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -25,7 +25,7 @@ jobs: tag_with_ref: true - name: Build and Push Frontend Docker Image - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/portfolio_backend/Cargo.lock b/portfolio_backend/Cargo.lock index 76a8ede..1aca8ea 100644 --- a/portfolio_backend/Cargo.lock +++ b/portfolio_backend/Cargo.lock @@ -466,7 +466,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -579,7 +579,7 @@ dependencies = [ "itoa", "pin-project", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -594,7 +594,7 @@ dependencies = [ "bytes 0.5.6", "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -1146,7 +1146,7 @@ dependencies = [ "rocket_cors", "serde", "serde_json", - "tokio", + "tokio 1.6.2", "uuid", ] @@ -1326,7 +1326,7 @@ dependencies = [ "pin-project-lite 0.2.6", "serde", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-tls", "url 2.2.1", "wasm-bindgen", @@ -1689,6 +1689,16 @@ dependencies = [ "slab", ] +[[package]] +name = "tokio" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aea337f72e96efe29acc234d803a5981cd9a2b6ed21655cd7fc21cfe021e8ec7" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.6", +] + [[package]] name = "tokio-tls" version = "0.3.1" @@ -1696,7 +1706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -1710,7 +1720,7 @@ dependencies = [ "futures-sink", "log 0.4.14", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/portfolio_backend/Cargo.toml b/portfolio_backend/Cargo.toml index ca900d3..dd3a679 100644 --- a/portfolio_backend/Cargo.toml +++ b/portfolio_backend/Cargo.toml @@ -20,7 +20,7 @@ rocket = { version = "0.4.7", default-features = false } rocket_cors = { version = "0.5.2", default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tokio = "0.2.25" +tokio = "1.6.2" uuid = { version = "0.8", features = ["v4"] } [dependencies.rocket_contrib] diff --git a/portfolio_frontend/package.json b/portfolio_frontend/package.json index c438532..673c9f5 100644 --- a/portfolio_frontend/package.json +++ b/portfolio_frontend/package.json @@ -11,7 +11,7 @@ "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^13.0.0", "@types/jest": "^26.0.15", - "@types/node": "^14.0.0", + "@types/node": "^15.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@types/react-router": "^5.1.9", @@ -19,7 +19,7 @@ "@types/react-router-dom": "^5.1.7", "@types/react-scroll": "^1.8.2", "axios": "^0.21.1", - "bootstrap": "^4.5.3", + "bootstrap": "^5.0.0", "github-contributions-canvas": "^0.6.0", "immutable": "^4.0.0-rc.12", "react": "^17.0.1", @@ -31,7 +31,7 @@ "react-scroll": "^1.8.1", "react-typed": "^1.2.0", "typescript": "^4.0.3", - "web-vitals": "^1.0.0" + "web-vitals": "^2.0.0" }, "scripts": { "start": "react-scripts start", diff --git a/portfolio_frontend/yarn.lock b/portfolio_frontend/yarn.lock index bf62e85..3bc3fe0 100644 --- a/portfolio_frontend/yarn.lock +++ b/portfolio_frontend/yarn.lock @@ -2512,10 +2512,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6" integrity sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw== -"@types/node@^14.0.0": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== +"@types/node@^15.0.0": + version "15.12.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" + integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -3600,10 +3600,10 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" - integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== +bootstrap@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.1.tgz#e7939d599119dc818a90478a2a299bdaff037e09" + integrity sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw== brace-expansion@^1.1.7: version "1.1.11" @@ -12031,10 +12031,10 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-vitals@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-1.0.1.tgz#025a7ffd9d8f5e4a030e3aee6061dcb38a4b6654" - integrity sha512-io/H/D18edTL1D2lcaUTLNLFEVZIPhNd4IdXDB9bEb+uDv2m/6NfyHiXKLFjbmI1ubeYpoQpR1gl9nlcWdI0vA== +web-vitals@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.0.1.tgz#d122720bd9c8dd69792b19c0f6ab0346861a880f" + integrity sha512-niqKyp2T6xF9EzSi+xx+V6qitE0YfagzfUmDAa9qeCrIVeyfzQQ85Uy0ykeRlEVDCCqkhYccoUunNf9ZIQcvtA== webidl-conversions@^5.0.0: version "5.0.0"