Skip to content

Commit

Permalink
chore: BE/AN path 지정 및 trigger 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
linirini committed Sep 12, 2024
1 parent 731e5fe commit f196ab3
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 68 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/android-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Android CI/CD for release
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
paths: './android/**'

env:
BASE_URL: ${{ secrets.BASE_URL }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Android CI/CD for generating demo APK
on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]
paths: './android/**'

env:
BASE_URL: ${{ secrets.BASE_URL }}
Expand Down
68 changes: 4 additions & 64 deletions .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Android CI for develop-an

on:
push:
branches: [ "develop-an" ]
pull_request:
branches: [ "develop-an" ]
paths: './android/**'

env:
BASE_URL: ${{ secrets.BASE_URL }}
Expand Down Expand Up @@ -68,70 +67,11 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Clean test
run: ./gradlew clean test

build:
needs: test
name: Build and Run
runs-on: ubuntu-latest

defaults:
run:
shell: bash
working-directory: ./android/Staccato_AN

permissions:
contents: read

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Create local.properties
run: |
touch local.properties
shell: bash

- name: Set Base Url in local.properties
run: |
echo "base_url=\"$BASE_URL\"" >> local.properties
shell: bash

- name: Create google-services.json
run: |
echo $GOOGLE_SERVICES_JSON > ./app/google-services.json
shell: bash

- name: Create secrets.properties
run: |
echo $SECRETS_PROPERTIES > secrets.properties
shell: bash

- name: Create local.defaults.properties
run: |
echo $LOCAL_DEFAULTS_PROPERTIES > local.defaults.properties
shell: bash

- name: Create KeyStore File and Properties
run: |
mkdir -p ./app/signing
echo "$UPLOAD_KEY_STORE_JKS" | base64 --decode > ./app/signing/upload_key_store.jks
echo "$KEY_STORE_PROPERTIES" > ./app/signing/keystore.properties
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run ktlint
run: ./gradlew ktlintCheck

- name: Run test
run: ./gradlew test

- name: Build with Gradle
run: ./gradlew build
1 change: 1 addition & 0 deletions .github/workflows/backend-ci-cd-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Backend CI/CD dev
on:
pull_request:
branches: [ "develop-be", "develop" ]
paths: './backend/**'

jobs:
ci:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/backend-ci-cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Backend CI/CD prod
on:
push:
branches: ["main"]
paths: './backend/**'

jobs:
ci:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/backend-ci-cd-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Backend CI/CD stage
on:
push:
branches: [ "develop-be", "develop" ]
paths: './backend/**'

jobs:
ci:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/backend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Backend CI
on:
pull_request:
branches: [ "develop-be", "develop", "main" ]
path: './backend/**'

permissions: write-all

Expand Down
76 changes: 76 additions & 0 deletions backend/src/main/resources/data.sql.disabled
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
-- member 테이블 데이터 삽입
INSERT INTO member (nickname, image_url, created_at, updated_at, is_deleted)
VALUES ('staccato',
'https://kin-phinf.pstatic.net/20201211_170/1607677307926ezvSd_JPEG/1607677307483.jpg?type=w750',
'2024-08-06 14:50:30', '2024-08-06 14:50:30', FALSE),
('Bob', 'https://kin-phinf.pstatic.net/20201211_170/1607677307926ezvSd_JPEG/1607677307483.jpg?type=w750',
'2024-08-06 14:50:31', '2024-08-06 14:50:31', FALSE);

-- memory 테이블 데이터 삽입
INSERT INTO memory (title, description, thumbnail_url, start_at, end_at, created_at, updated_at)
VALUES ('Trip to Paris', 'A wonderful trip to Paris',
'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg',
'2024-08-01',
'2024-08-10', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Mountain Hiking', 'Hiking in the mountains',
'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg',
'2024-09-01',
'2024-09-05', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Beach Vacation', 'Relaxing on the beach',
'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg',
'2024-07-15',
'2024-07-20', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('City Tour', 'Exploring the city',
'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg',
'2024-06-10',
'2024-06-12', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Desert Adventure', 'An adventure in the desert',
'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg',
'2024-05-01',
'2024-05-05', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

-- memory_member 테이블 데이터 삽입
INSERT INTO memory_member (member_id, memory_id, created_at, updated_at)
VALUES (1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(1, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(2, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(1, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(2, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

-- moment 테이블 데이터 삽입
INSERT INTO moment (place_name, address, visited_at, latitude, longitude, memory_id, created_at, updated_at)
VALUES ('Eiffel Tower', 'Champ de Mars, 5 Avenue Anatole France, 75007 Paris, France', '2024-08-06 14:50:31',
48.8588443, 2.2943506, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Louvre Museum', 'Rue de Rivoli, 75001 Paris, France', '2024-08-07 14:50:31', 48.8606111, 2.337644,
1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Notre Dame', '6 Parvis Notre-Dame - Pl. Jean-Paul II, 75004 Paris, France', '2024-08-08 14:50:31',
48.8529682, 2.3499021, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Mont Blanc', 'Mont Blanc, France', '2024-08-09 14:50:31', 45.832622, 6.865150, 2, CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP),
('Matterhorn', 'Matterhorn, Zermatt, Switzerland', '2024-09-03 14:50:31', 45.9763, 7.6586, 2, CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP),
('Beachside Resort', '123 Beach Rd, Malibu, CA', '2024-07-16 14:50:31', 34.025922, -118.779757, 3,
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Venice Beach', 'Venice Beach, Los Angeles, CA', '2024-07-17 14:50:31', 33.9850, -118.4695, 3,
CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP),
('Old City', '456 Old City St, Example City, EX', '2024-06-11 14:50:31', 35.6895, 139.6917, 4, CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP),
('Tokyo Tower', '4 Chome-2-8 Shibakoen, Minato City, Tokyo 105-0011, Japan', '2024-06-12 14:50:31',
35.6585805, 139.7454329, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('Desert Dunes', '789 Desert Rd, Sahara', '2024-05-02 14:50:31', 23.4162, 25.6628, 5, CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP);

-- moment_image 테이블 데이터 삽입
INSERT INTO moment_image (moment_id, image_url)
VALUES (1, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(2, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(3, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(4, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(5, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(6, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(7, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(8, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(9, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg'),
(10, 'https://as2.ftcdn.net/v2/jpg/05/26/12/07/1000_F_526120779_zO3klHfSGF7X6k0UZUbtXJuXo7KUJibv.jpg');

0 comments on commit f196ab3

Please sign in to comment.