Skip to content

Commit 1bc0639

Browse files
committed
Merge branch 'master' into revert/lodash
2 parents 28b4bcd + 34fde44 commit 1bc0639

10 files changed

Lines changed: 17 additions & 16 deletions

.github/workflows/build-and-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches: ["master"]
55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04.5
88
steps:
99
- name: Check Out Repo
1010
uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
2424
tags: ${{ secrets.DOCKERHUB_USERNAME }}/bridge:${{ github.sha }}
2525
deploy:
2626
needs: build
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-22.04.5
2828
environment:
2929
name: production
3030
steps:

.github/workflows/build-and-publish-preview.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches: ["master"]
55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04.5
88
steps:
99
- name: Check Out Repo
1010
uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
2424
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-dev:${{ github.sha }}
2525
dispatch_update_preview_image:
2626
needs: build
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-22.04.5
2828
steps:
2929
- name: Dispatch Update Preview Image Command
3030
uses: myrotvorets/trigger-repository-dispatch-action@1.0.0

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'master'
99
jobs:
1010
test:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04.5
1212
permissions:
1313
contents: read
1414
packages: read

.github/workflows/clean-up-pr-preview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [closed]
55
jobs:
66
dispatch_cleanup_deployment:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04.5
88
steps:
99
- name: Dispatch Cleanup Preview Repository Command
1010
uses: myrotvorets/trigger-repository-dispatch-action@1.0.0

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
analyze:
2525
name: Analyze
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-22.04.5
2727
permissions:
2828
actions: read
2929
contents: read

.github/workflows/deploy-pr-preview.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [opened, reopened, synchronize, ready_for_review]
55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04.5
88
steps:
99
- name: Check Out Repo
1010
uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
2424
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-dev:preview-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}
2525
add_ready_for_preview_label:
2626
if: github.event.pull_request.draft == false
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-22.04.5
2828
needs: build
2929
steps:
3030
- uses: actions-ecosystem/action-add-labels@v1
@@ -33,7 +33,7 @@ jobs:
3333
ready-for-preview
3434
dispatch_update_deployment:
3535
needs: add_ready_for_preview_label
36-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-22.04.5
3737
if: ${{ contains(github.event.pull_request.labels.*.name, 'deployed') }}
3838
steps:
3939
- name: Dispatch Update Preview Repository Command
@@ -68,7 +68,7 @@ jobs:
6868
}
6969
dispatch_check_deployment:
7070
needs: add_ready_for_preview_label
71-
runs-on: ubuntu-latest
71+
runs-on: ubuntu-22.04.5
7272
if: ${{ contains(github.event.pull_request.labels.*.name, 'preview') }}
7373
steps:
7474
- name: Dispatch Check Preview Repository Command

.github/workflows/pre-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
node-version: [16.x]
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04.5
1414
steps:
1515
- name: Check Out Repo
1616
uses: actions/checkout@v3

.github/workflows/slash-command-dispatcher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [created]
55
jobs:
66
slash_command_dispatch:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04.5
88
if: ${{ contains(github.event.issue.labels.*.name, 'deployed') || contains(github.event.issue.labels.*.name, 'preview') }}
99
steps:
1010
- name: Slash Command Dispatch

.github/workflows/sonar-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
matrix:
1212
node-version: [16.x]
1313
name: SonarCloud
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04.5
1515
steps:
1616
- uses: actions/checkout@v3
1717
with:

yarn.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8561,11 +8561,12 @@ stop-iteration-iterator@^1.1.0:
85618561
nat-upnp "^1.1.0"
85628562
ntp-client "^0.5.3"
85638563
portfinder "^1.0.3"
8564-
readable-stream "^3.6.0"
8564+
readable-stream "^2.0.6"
85658565
request "^2.83.0"
85668566
restify "^8.5.1"
85678567
restify-clients "^3.1.0"
85688568
rimraf "^3.0.2"
8569+
scrypt "^6.0.3"
85698570
secp256k1 "^4.0.0"
85708571
semver "^7.3.5"
85718572
through "^2.3.8"
@@ -8576,7 +8577,7 @@ stop-iteration-iterator@^1.1.0:
85768577
dependencies:
85778578
mongoose "^7.8.7"
85788579
storj-lib "github:internxt/core#v8.7.3-beta"
8579-
storj-service-storage-models "github:internxt/service-storage-models#11.1.0"
8580+
storj-service-storage-models "github:internxt/service-storage-models#11.0.0"
85808581

85818582
"storj-service-error-types@github:internxt/service-error-types":
85828583
version "1.5.0"

0 commit comments

Comments
 (0)