Skip to content

Commit

Permalink
Update toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
IRus committed Aug 19, 2023
1 parent 3396e55 commit 59dddf3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 20 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# Linux start script should use lf
gradlew text eol=lf

# These are Windows script files and should use crlf
*.bat text eol=crlf

20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ jobs:
name: "Build backend"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: "11"
distribution: "zulu"
java-version: "17"
distribution: "liberica"
- uses: gradle/gradle-build-action@v2
- run: ./gradlew check distTar
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: "Kotlin Application"
path: "tgkotbot/build/distributions/kotbot.tar"
Expand All @@ -24,23 +24,23 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: "Kotlin Application"
path: "tgkotbot/build/distributions/"
- name: "Untar files"
run: mkdir -p tgkotbot/build/install && tar -xvf tgkotbot/build/distributions/kotbot.tar -C $_
- name: "Set up Docker Buildx"
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: "Login to GHCR"
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: "Build and push"
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: tgkotbot
push: true
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
coroutines = "1.7.2"
flyway = "9.20.1"
coroutines = "1.7.3"
flyway = "9.21.1"
hikari = "5.0.1"
jsoup = "1.16.1"
junit = "5.9.3"
junit = "5.10.0"
kotlin = "1.9.0"
ktor = "2.3.2"
logback = "1.4.8"
micrometer = "1.11.2"
mockk = "1.13.5"
ktor = "2.3.3"
logback = "1.4.11"
micrometer = "1.11.3"
mockk = "1.13.7"
poet = "1.14.2"
postgresql = "42.6.0"
serialization = "1.5.1"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion tgkotbot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM bellsoft/liberica-openjre-alpine:17.0.7
FROM bellsoft/liberica-openjre-alpine:17.0.8
COPY /build/install/kotbot /kotbot
ENTRYPOINT /kotbot/bin/kotbot

0 comments on commit 59dddf3

Please sign in to comment.