From 29c38cde076118928039fc5ec2e8b561608f2967 Mon Sep 17 00:00:00 2001 From: ange Date: Thu, 14 Nov 2024 18:49:54 +0800 Subject: [PATCH 01/15] Add docker build apk --- dialer/compose.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 dialer/compose.yaml diff --git a/dialer/compose.yaml b/dialer/compose.yaml new file mode 100644 index 0000000..7ebdca4 --- /dev/null +++ b/dialer/compose.yaml @@ -0,0 +1,9 @@ +--- +services: + build: + image: git.gmoker.com/icing/flutter:v0.2.0 + volumes: + - ".:/app/" + command: + - build + - apk -- 2.45.2 From 897e3aa9e4833f5e8dbb24904b98977ee3fea757 Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 18 Dec 2024 03:46:27 +0000 Subject: [PATCH 02/15] feat: build + run scripts --- dialer/compose.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 dialer/compose.yaml diff --git a/dialer/compose.yaml b/dialer/compose.yaml deleted file mode 100644 index 7ebdca4..0000000 --- a/dialer/compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -services: - build: - image: git.gmoker.com/icing/flutter:v0.2.0 - volumes: - - ".:/app/" - command: - - build - - apk -- 2.45.2 From 0d58e600bea05aba1bdb95f5fdf6d6bc576d4939 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 04:13:50 +0000 Subject: [PATCH 03/15] feat: cicd to build apk --- .gitea/workflows/apk.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitea/workflows/apk.yaml diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml new file mode 100644 index 0000000..5085cf8 --- /dev/null +++ b/.gitea/workflows/apk.yaml @@ -0,0 +1,17 @@ +on: + push: + branches: + - dev + tags: + - '*' + +jobs: + build: + runs-on: debian + defaults: + run: + working-directory: dialer + steps: + - uses: actions/checkout@v1 + - run: | + ./build.sh # actually doesn't work bc no docker in debian -- 2.45.2 From ef66b711c66e455b662bc74c304d6a24bad2d6ff Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 04:15:43 +0000 Subject: [PATCH 04/15] feat: autobuild only if dialer/** if modified --- .gitea/workflows/apk.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 5085cf8..b5a6a26 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -1,9 +1,7 @@ on: push: - branches: - - dev - tags: - - '*' + paths: + - dialer/** jobs: build: -- 2.45.2 From 7b26e095e331aa5e17c4ae19f58b1bb759049319 Mon Sep 17 00:00:00 2001 From: ange Date: Thu, 2 Jan 2025 02:42:37 +0000 Subject: [PATCH 05/15] feat: action build apk --- .gitea/workflows/apk.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index b5a6a26..6c6434a 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -1,15 +1,15 @@ on: push: - paths: - - dialer/** + #paths: + # - dialer/** jobs: build: runs-on: debian + container: git.gmoker.com/icing/flutter:main defaults: run: working-directory: dialer steps: - uses: actions/checkout@v1 - - run: | - ./build.sh # actually doesn't work bc no docker in debian + - run: flutter build apk -- 2.45.2 From 47173e1a8dc15d329d2545a216165d912d3959b9 Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 1 Feb 2025 15:32:58 +0000 Subject: [PATCH 06/15] feat: upload-apk --- .gitea/workflows/apk.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 6c6434a..dfc76fb 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -13,3 +13,7 @@ jobs: steps: - uses: actions/checkout@v1 - run: flutter build apk + - uses: actions/upload-artifact@v1 + with: + name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk + path: build/app/outputs/apk/release/app-release.apk -- 2.45.2 From ce436933bcaf9c8b05d9d2bb0ee7cd8965922e1c Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 1 Feb 2025 16:20:28 +0000 Subject: [PATCH 07/15] fix: container misses commands --- .gitea/workflows/apk.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index dfc76fb..9ae51ea 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -6,14 +6,13 @@ on: jobs: build: runs-on: debian - container: git.gmoker.com/icing/flutter:main defaults: run: working-directory: dialer steps: - uses: actions/checkout@v1 - - run: flutter build apk + - uses: docker://git.gmoker.com/icing/flutter:main - uses: actions/upload-artifact@v1 with: name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk - path: build/app/outputs/apk/release/app-release.apk + path: build/app/outputs/flutter-apk/app-release.apk -- 2.45.2 From a2a86804d4cb2dfd60bb60223ab088df41d701dd Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 1 Feb 2025 17:13:16 +0000 Subject: [PATCH 08/15] fix: using flutter action instead of docker --- .gitea/workflows/apk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 9ae51ea..1a9e469 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -11,7 +11,7 @@ jobs: working-directory: dialer steps: - uses: actions/checkout@v1 - - uses: docker://git.gmoker.com/icing/flutter:main + - uses: icing/flutter@main - uses: actions/upload-artifact@v1 with: name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk -- 2.45.2 From 0a170871addae7e3943bd931c933a7c118e0ab1e Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 1 Feb 2025 23:55:23 +0000 Subject: [PATCH 09/15] test --- .gitea/workflows/apk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 1a9e469..4f4d8e7 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -11,7 +11,7 @@ jobs: working-directory: dialer steps: - uses: actions/checkout@v1 - - uses: icing/flutter@main + - uses: icing/flutter@test - uses: actions/upload-artifact@v1 with: name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk -- 2.45.2 From 33b6485547a8ef78b830ab1c98ab8900c800a197 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 00:54:01 +0000 Subject: [PATCH 10/15] feat: checkout subpath --- .gitea/workflows/apk.yaml | 4 +--- .gitea/workflows/website.yaml | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 4f4d8e7..500d197 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -6,11 +6,9 @@ on: jobs: build: runs-on: debian - defaults: - run: - working-directory: dialer steps: - uses: actions/checkout@v1 + subpath: dialer/ - uses: icing/flutter@test - uses: actions/upload-artifact@v1 with: diff --git a/.gitea/workflows/website.yaml b/.gitea/workflows/website.yaml index 56d3687..5bd3b71 100644 --- a/.gitea/workflows/website.yaml +++ b/.gitea/workflows/website.yaml @@ -1,16 +1,14 @@ on: push: - paths: - - website/** + #paths: + # - website/** jobs: deploy: runs-on: debian - defaults: - run: - working-directory: website steps: - uses: actions/checkout@v1 + subpath: website/ - name: setup env run: | . ./.env || true @@ -29,10 +27,9 @@ jobs: - uses: actions/kaniko@v1 with: password: "${{ secrets.PKGRW }}" - dockerfile: website/Dockerfile + dockerfile: Dockerfile - uses: actions/k8sdeploy@v1 with: kubeconfig: "${{ secrets.K8S }}" registry_password: "${{ secrets.PKGRW }}" - workdir: website -- 2.45.2 From b184efd60cbccd1a17e7f6d36be1885f80cc7aee Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 01:08:12 +0000 Subject: [PATCH 11/15] test --- .gitea/workflows/apk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 500d197..f5aedcc 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -7,7 +7,7 @@ jobs: build: runs-on: debian steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@main subpath: dialer/ - uses: icing/flutter@test - uses: actions/upload-artifact@v1 -- 2.45.2 From ec9e5434e5b30469f216cba8000cae89a7b67c01 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 01:10:23 +0000 Subject: [PATCH 12/15] fix: action with keyword missing --- .gitea/workflows/apk.yaml | 5 +++-- .gitea/workflows/website.yaml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index f5aedcc..e1015f6 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -7,8 +7,9 @@ jobs: build: runs-on: debian steps: - - uses: actions/checkout@main - subpath: dialer/ + - uses: actions/checkout@v1 + with: + subpath: dialer/ - uses: icing/flutter@test - uses: actions/upload-artifact@v1 with: diff --git a/.gitea/workflows/website.yaml b/.gitea/workflows/website.yaml index 5bd3b71..7742a81 100644 --- a/.gitea/workflows/website.yaml +++ b/.gitea/workflows/website.yaml @@ -8,7 +8,8 @@ jobs: runs-on: debian steps: - uses: actions/checkout@v1 - subpath: website/ + with: + subpath: website/ - name: setup env run: | . ./.env || true -- 2.45.2 From 38ef6e4692d7557e23026ea95bfa8eee00d92dd0 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 01:11:19 +0000 Subject: [PATCH 13/15] feat: remove flutter test --- .gitea/workflows/apk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index e1015f6..33a556f 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v1 with: subpath: dialer/ - - uses: icing/flutter@test + - uses: icing/flutter@main - uses: actions/upload-artifact@v1 with: name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk -- 2.45.2 From ef2c2ca50f8225e007058fc80cee5f214ff2c4fa Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 01:32:04 +0000 Subject: [PATCH 14/15] feat: restrict actions to modified files --- .gitea/workflows/apk.yaml | 4 ++-- .gitea/workflows/website.yaml | 4 ++-- website/open.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/apk.yaml b/.gitea/workflows/apk.yaml index 33a556f..db63776 100644 --- a/.gitea/workflows/apk.yaml +++ b/.gitea/workflows/apk.yaml @@ -1,7 +1,7 @@ on: push: - #paths: - # - dialer/** + paths: + - dialer/** jobs: build: diff --git a/.gitea/workflows/website.yaml b/.gitea/workflows/website.yaml index 7742a81..c113a53 100644 --- a/.gitea/workflows/website.yaml +++ b/.gitea/workflows/website.yaml @@ -1,7 +1,7 @@ on: push: - #paths: - # - website/** + paths: + - website/** jobs: deploy: diff --git a/website/open.sh b/website/open.sh index f39b04f..743e671 100755 --- a/website/open.sh +++ b/website/open.sh @@ -2,4 +2,4 @@ branch="$(git describe --contains --all HEAD)" -xdg-open "https://$branch.g-eip-700-tls-7-1-eip-stephane.corbiere.icing.k8s.gmoker.com" +xdg-open "https://$branch.monorepo.icing.k8s.gmoker.com" -- 2.45.2 From 41c834449d5f8fd12c9906e0c879a158368633f0 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 2 Feb 2025 01:35:56 +0000 Subject: [PATCH 15/15] fix: remove unneeded instruction --- .gitea/workflows/website.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/website.yaml b/.gitea/workflows/website.yaml index c113a53..9a4c6bd 100644 --- a/.gitea/workflows/website.yaml +++ b/.gitea/workflows/website.yaml @@ -28,7 +28,6 @@ jobs: - uses: actions/kaniko@v1 with: password: "${{ secrets.PKGRW }}" - dockerfile: Dockerfile - uses: actions/k8sdeploy@v1 with: -- 2.45.2