From 35c20061e1d6fd7a3794ed45d6df48a3a7631739 Mon Sep 17 00:00:00 2001 From: Juser0 Date: Mon, 11 Sep 2023 00:29:29 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]=20workflow=20=EB=B0=8F=20=EC=BB=A8?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=84=88=20=EB=B9=8C=EB=93=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=88=98=EC=A0=95=20-=20#56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-ci.yml | 6 ++++-- .github/workflows/gradle-cicd.yml | 3 --- favor/build.gradle | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml index 62da4b9..beab12e 100644 --- a/.github/workflows/gradle-ci.yml +++ b/.github/workflows/gradle-ci.yml @@ -1,7 +1,7 @@ name: Gradle CI on: - push: + pull_request: branches: - main @@ -22,8 +22,10 @@ jobs: java-version: '11' distribution: 'temurin' - - name: Create application.yml + - name: Create properties run: | + cd favor + echo "${{ secrets.GRADLE_PROPERTIES_CONTENT }}" > gradle.properties mkdir -p src/main/resources echo "${{ secrets.APPLICATION_YML_CONTENT }}" > src/main/resources/application.yml diff --git a/.github/workflows/gradle-cicd.yml b/.github/workflows/gradle-cicd.yml index 97bd6cc..e3a8624 100644 --- a/.github/workflows/gradle-cicd.yml +++ b/.github/workflows/gradle-cicd.yml @@ -35,9 +35,6 @@ jobs: chmod +x gradlew - name: Build with Gradle - env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: | cd favor ./gradlew jib diff --git a/favor/build.gradle b/favor/build.gradle index 9624050..4d92756 100644 --- a/favor/build.gradle +++ b/favor/build.gradle @@ -26,12 +26,6 @@ jib { } from { image = "eclipse-temurin:11-jre" - platforms { - platform { - architecture = "arm64" - os = "linux" - } - } auth { username = project.findProperty('DockerUsername') password = project.findProperty('DockerPassword')