Skip to content

Commit

Permalink
Merge pull request #28 from routific/develop
Browse files Browse the repository at this point in the history
Merge Develop -> Staging
  • Loading branch information
serenajht authored Nov 20, 2024
2 parents 019cf10 + 5ddefc9 commit bfe5a94
Show file tree
Hide file tree
Showing 39 changed files with 3,760 additions and 542 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- get-environment-name
environment: ${{ needs.get-environment-name.outputs.environment }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand Down Expand Up @@ -49,12 +49,12 @@ jobs:
NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
- name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: '**/build/reports'
- name: Store Buildscan URL
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-scan
path: 'buildscan.log'
Expand All @@ -64,12 +64,11 @@ jobs:
run:
working-directory: ui
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '14.x'
- name: Install dependencies
run: yarn install
- run: yarn run build

2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
name: Gradle Build and Publish
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Zulu JDK 11
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
update-gradle-wrapper:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Zulu JDK 11
uses: actions/setup-java@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions annotations-processor/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"compileClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -145,7 +145,7 @@
},
"runtimeClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -244,7 +244,7 @@
},
"testCompileClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -605,7 +605,7 @@
},
"testRuntimeClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -988,4 +988,4 @@
]
}
}
}
}
Loading

0 comments on commit bfe5a94

Please sign in to comment.