Skip to content

Commit 219138a

Browse files
committed
Merge branch 'release/1.0.3' into main
2 parents f775637 + 55353b8 commit 219138a

File tree

3 files changed

+26
-35
lines changed

3 files changed

+26
-35
lines changed

.github/workflows/publish-on-version-change.yml

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,39 @@ jobs:
2020
check-version-change:
2121
runs-on: ubuntu-latest
2222
outputs:
23-
version-changed: ${{ steps.version-check.outputs.changed }} # 버전 변경 여부를 다음 작업에 전달
24-
new-version: ${{ steps.version-check.outputs.version }} # 새 버전 값을 다음 작업에 전달
23+
version-changed: ${{ steps.version-check.outputs.changed }} # 버전 변경 여부
24+
new-version: ${{ steps.version-check.outputs.version }} # 새 버전
2525
steps:
26-
# 코드를 체크아웃 (이전 커밋과 비교하기 위해 깊이를 2로 설정)
26+
# 현재 브랜치 코드 체크아웃
2727
- name: Checkout code
2828
uses: actions/checkout@v4
2929
with:
30-
fetch-depth: 2 # 현재와 이전 커밋을 가져오기 위함
30+
fetch-depth: 1
31+
ref: ${{ github.ref }} # 현재 push된 브랜치
32+
persist-credentials: false
3133

32-
# sdk_version이 변경되었는지 확인하는 단계
33-
- name: Check if sdk_version changed
34+
# 최신 develop 브랜치만 fetch (비교용)
35+
- name: Fetch develop branch
36+
run: git fetch origin develop --depth=1
37+
38+
# sdk_version 비교
39+
- name: Check if sdk_version changed (vs origin/develop)
3440
id: version-check
3541
run: |
36-
# 현재 커밋의 sdk_version 값 추출
37-
CURRENT_VERSION=$(grep "sdk_version" gradle/libs.versions.toml | cut -d '"' -f 2)
38-
echo "Current version: $CURRENT_VERSION"
42+
# develop 브랜치의 sdk_version 추출
43+
PREV=$(git show origin/develop:gradle/libs.versions.toml | grep 'sdk_version' | cut -d '"' -f2 || true)
3944
40-
# 이전 커밋의 sdk_version 값 추출
41-
git checkout HEAD~1 -- gradle/libs.versions.toml 2>/dev/null || echo "No previous version found"
42-
PREVIOUS_VERSION=$(grep "sdk_version" gradle/libs.versions.toml | cut -d '"' -f 2 2>/dev/null || echo "")
43-
echo "Previous version: $PREVIOUS_VERSION"
45+
# 현재 브랜치의 sdk_version 추출
46+
CURR=$(grep 'sdk_version' gradle/libs.versions.toml | cut -d '"' -f2 || true)
4447
45-
# 현재 버전으로 파일 복원
46-
git checkout HEAD -- gradle/libs.versions.toml
48+
echo "develop: $PREV"
49+
echo "current: $CURR"
4750
48-
# 버전이 변경되었고 유효한 값인지 확인
49-
if [ "$CURRENT_VERSION" != "$PREVIOUS_VERSION" ] && [ -n "$CURRENT_VERSION" ]; then
51+
# 변경 여부 판단
52+
if [ "$CURR" != "$PREV" ] && [ -n "$CURR" ]; then
5053
echo "changed=true" >> $GITHUB_OUTPUT
51-
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
52-
echo "Version changed from $PREVIOUS_VERSION to $CURRENT_VERSION"
54+
echo "version=$CURR" >> $GITHUB_OUTPUT
55+
echo "Version changed from $PREV → $CURR"
5356
else
5457
echo "changed=false" >> $GITHUB_OUTPUT
5558
echo "Version not changed"
@@ -87,19 +90,6 @@ jobs:
8790
- name: Grant execute permission for gradlew
8891
run: chmod +x gradlew
8992

90-
# GitHub Packages 배포를 위한 인증 정보 생성
91-
- name: Create github.properties
92-
run: |
93-
echo "url=https://maven.pkg.github.com/${{ github.repository }}" > github.properties
94-
echo "github_username=${{ github.actor }}" >> github.properties
95-
echo "github_token=${{ secrets.DONGLAB_DEVTOOLS_GITHUB_TOKEN }}" >> github.properties
96-
97-
# 라이브러리 빌드 및 GitHub Packages에 배포
98-
- name: Build and publish to GitHub Packages
99-
run: ./gradlew publishReleasePublicationToMavenRepository
100-
env:
101-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102-
10393
# 새 버전으로 GitHub Release 생성
10494
- name: Create GitHub Release
10595
uses: softprops/action-gh-release@v1
@@ -109,12 +99,12 @@ jobs:
10999
body: |
110100
SDK version updated to ${{ needs.check-version-change.outputs.new-version }}
111101
112-
Published to GitHub Packages automatically.
102+
Published to Jitpack automatically.
113103
114104
**사용 방법**
115105
- 자세한 사용법은 [README](https://github.com/${{ github.repository }}/blob/main/README.md)를 참고하세요.
116106
117107
draft: false # 즉시 공개
118108
prerelease: false # 정식 릴리즈로 설정
119109
env:
120-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[![Hits](https://myhits.vercel.app/api/hit/https%3A%2F%2Fgithub.com%2FDongLab-DevTools%2FScreenNameViewer-For-Compose%3Ftab%3Dreadme-ov-file?color=blue&label=hits&size=small)](https://myhits.vercel.app)
33
[![Platform](https://img.shields.io/badge/platform-Android-3DDC84?style=flat-square&logo=android)](https://developer.android.com)
44
[![Min SDK](https://img.shields.io/badge/min%20sdk-21-green?style=flat-square)](https://developer.android.com)
5+
[![Jitpack](https://jitpack.io/v/DongLab-DevTools/ScreenNameViewer-For-Compose.svg)](https://jitpack.io/#DongLab-DevTools/ScreenNameViewer-For-Compose)
56

67

78
**[한국어 README](./README_ko.md)**

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
leakcanaryAndroid = "2.14"
3-
sdk_version = "1.0.1-alpha-02"
3+
sdk_version = "1.0.3"
44

55
agp = "8.1.4"
66
kotlin = "1.9.20"

0 commit comments

Comments
 (0)