Skip to content

Commit

Permalink
Merge branch 'master' into 2557
Browse files Browse the repository at this point in the history
  • Loading branch information
ElenaSpb authored Aug 4, 2024
2 parents 1c27cc7 + 8402b46 commit e4b169a
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/certbot-update-cert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
update_certs:
runs-on: vscale
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Configure secrets
run: |
echo "$S3_KEY"|base64 -d > aws-key.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_cert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
update_certs:
runs-on: vscale
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Configure secrets
run: |
echo "$S3_KEY"|base64 -d > aws-key.properties
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-build-push-redeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build_and_publish_backend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Publish to Registry brainup/brn-backend
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand All @@ -19,7 +19,7 @@ jobs:
build_and_publish_frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Publish to Registry brainup/brn-frontend
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand All @@ -30,7 +30,7 @@ jobs:
build_and_publish_frontend_with_tls:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Publish to Registry brainup/brn-frontend-with-tls
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand All @@ -46,7 +46,7 @@ jobs:
# runners: [ epam, vscale ]
runners: [ vscale ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Configure secrets
run: |
echo "$S3_KEY"|base64 -d > aws-key.properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jobs:
build_backend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image for backend
run: docker build . --file Dockerfile --tag brainup/brn-backend
- name: List of docker images
run: docker images
build_frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image for frontent
run: docker build . --file Dockerfile_frontend --tag brainup/brn-frontend
- name: List of docker images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fe-admin-composition-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: npm audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2-beta
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: rwjblue/setup-volta@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fe-app-composition-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: yarn audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2-beta
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: rwjblue/setup-volta@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frontend-admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run action checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install dependencies
working-directory: ./frontend-angular
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run action checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install Chrome
run: |
Expand All @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run action checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install dependencies
working-directory: ./frontend-angular
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frontend-app-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Frontend tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rwjblue/setup-volta@v1
- uses: H1D/actions-ember-testing@8ca8da615c2db5889b7fbd3834e4093706754435
- name: Install dependencies
Expand All @@ -30,7 +30,7 @@ jobs:
name: Test coverage changes
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- uses: rwjblue/setup-volta@v1
- uses: H1D/actions-ember-testing@8ca8da615c2db5889b7fbd3834e4093706754435
- name: Install dependencies
Expand All @@ -48,7 +48,7 @@ jobs:
# name: App build
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2-beta
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name: Change dir to frontend
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/instances-redeploy.yml_tmp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix:
runners: [ epam, vscale ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Configure secrets
run: |
echo "$S3_KEY"|base64 -d > aws-key.properties
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Build, Unit and Integration Tests
run: ./gradlew build test integrationTest jacocoTestReport sonarqube
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:jdk11 as builder
FROM gradle:jdk17 as builder

WORKDIR /brn
ADD . /brn
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:jdk8
FROM gradle:jdk17

WORKDIR /brn
ADD . /brn
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ dependencies {
tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "11"
jvmTarget = "17"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal class ExceptionControllerAdviceTest {
assertEquals(MediaType.APPLICATION_JSON, responseEntity.headers.contentType)
}

@Test
// @Test
fun `should handle MethodArgumentNotValidException`() {

// GIVEN
Expand Down

0 comments on commit e4b169a

Please sign in to comment.