Skip to content

Commit

Permalink
Merge pull request #269 from PabloLec/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
PabloLec authored Oct 28, 2023
2 parents de4579e + fb93bf4 commit 1fa5806
Show file tree
Hide file tree
Showing 8 changed files with 377 additions and 373 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/blacklist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
update-blacklist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_workers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
runs-on: ubuntu-latest
name: Deploy
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Publish mongo-proxy
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3.3.2
with:
preCommands: cd src/main/workers/api && npm install .
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
command: publish --env production --var REALM_APPID:${{ secrets.REALM_APPID }} --var MONGO_API_KEY:${{ secrets.MONGO_API_KEY }}
- name: Publish prerender
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3.3.2
with:
preCommands: cd src/main/workers/prerender && npm install .
apiToken: ${{ secrets.CF_API_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build docker image
run: docker build -f docker/Dockerfile -t starrylines_${{ github.sha }} . --no-cache
- name: Run
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: backend
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: |
Expand Down Expand Up @@ -62,9 +62,9 @@ jobs:
run:
working-directory: src/main/vue
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
runs-on: ubuntu-latest
needs: [backend, frontend]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download tests report
uses: actions/download-artifact@v3
with:
Expand Down
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.9.0-RC"
kotlin("jvm") version "1.9.10"
application
jacoco
id("com.apollographql.apollo3") version "3.8.2"
Expand All @@ -15,17 +15,17 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
implementation("org.litote.kmongo:kmongo:4.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.litote.kmongo:kmongo:4.10.0")
implementation("io.github.microutils:kotlin-logging-jvm:3.0.5")
implementation("org.slf4j:slf4j-log4j12:2.0.7")
implementation("org.slf4j:slf4j-log4j12:2.0.9")
implementation("com.jcabi:jcabi-log:0.23.0")
implementation("com.apollographql.apollo3:apollo-runtime:3.8.2")
implementation("com.github.sya-ri:kgit:1.0.5")
testImplementation(kotlin("test"))
testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
testImplementation("io.mockk:mockk:1.13.5")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
testImplementation("io.mockk:mockk:1.13.8")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
testImplementation("com.apollographql.apollo3:apollo-testing-support:3.8.2")
}

Expand Down
16 changes: 8 additions & 8 deletions src/main/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"preview": "vite preview"
},
"dependencies": {
"autoprefixer": "10.4.14",
"autoprefixer": "10.4.16",
"postcss": "8.4.31",
"swiper": "9.4.1",
"tailwindcss": "3.3.2",
"swiper": "11.0.3",
"tailwindcss": "3.3.3",
"vue": "3.3.4",
"vue-final-modal": "4.4.3",
"vue-router": "4.2.2",
"vue-final-modal": "4.4.5",
"vue-router": "4.2.5",
"vue3-easy-data-table": "1.5.47"
},
"devDependencies": {
"@vitejs/plugin-vue": "3.2.0",
"typescript": "5.1.6",
"vite": "3.2.7",
"vue-tsc": "1.8.3"
"typescript": "5.2.2",
"vite": "3.2.5",
"vue-tsc": "1.8.22"
}
}
Loading

0 comments on commit 1fa5806

Please sign in to comment.