From b23941004c56c4dc4f9818a97b2de9eb99e6dd1e Mon Sep 17 00:00:00 2001 From: Elysia Date: Fri, 18 Oct 2024 23:17:32 +0800 Subject: [PATCH 1/7] Add DTK2 --- Configs/dtk2core.json | 6 ++++++ Configs/dtk2widget.json | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 Configs/dtk2core.json create mode 100644 Configs/dtk2widget.json diff --git a/Configs/dtk2core.json b/Configs/dtk2core.json new file mode 100644 index 0000000..e94ad4d --- /dev/null +++ b/Configs/dtk2core.json @@ -0,0 +1,6 @@ +{ + "Name": "dtk2core", + "Repository": "https://gitee.com/GXDE-OS/dtk2core.git", + "Tag": "2.2.5", + "BuildType": "Debian" +} diff --git a/Configs/dtk2widget.json b/Configs/dtk2widget.json new file mode 100644 index 0000000..ee1858c --- /dev/null +++ b/Configs/dtk2widget.json @@ -0,0 +1,6 @@ +{ + "Name": "dtk2widget", + "Repository": "https://gitee.com/GXDE-OS/dtk2widget.git", + "Tag": "2.2.5.8-1", + "BuildType": "Debian" +} From 7d3b531e23b5c9d3302a4f372517e7d8ae87204b Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:20:58 +0800 Subject: [PATCH 2/7] Added auto push --- .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eaef19..7d049a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,3 +62,39 @@ jobs: name: Lingmo Artifacts With Nightly ${{ matrix.devbuild }} path: BuildArtifacts compression-level: 9 # maximum compression + + - name: Prepare envs + if: ${{ matrix.devbuild == 'enabled' }} + run: | + sudo apt update && sudo apt install reprepro gnupg + echo "${{ secrets.GPG_SIGN_KEY }}" >> key.key + gpg --import key.key + + - name: Clone & Update repo + if: ${{ matrix.devbuild == 'enabled' }} + run: | + git clone https://github.com/LingmoOS/lingmo-nightly-build.git pkg_site + DEB_FILE_DIR="$(pwd)/BuildArtifacts" + + cd pkg_site + git checkout --orphan latest_branch + + bash ./add_debs.sh $DEB_FILE_DIR $(pwd) "nightly" + + git config --global user.email "automation@lingmo.org" + git config --global user.name "Lingmo Automation Packer" + git add . && git commit -m "Update Packages By Actions" + git branch -D master + git branch -m master + + cd .. + + - name: Push changes + if: ${{ matrix.devbuild == 'enabled' }} + uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019 + with: + github_token: ${{ secrets.API_GITHUB_TOKEN }} + repository: "LingmoOS/lingmo-nightly-build" + directory: "./pkg_site" + branch: 'main' + force: true \ No newline at end of file From a60a4e894d744b957442e8d96a7ed10f278035e1 Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:21:20 +0800 Subject: [PATCH 3/7] Fix format --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d049a9..cfe1fbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,12 +89,12 @@ jobs: cd .. - - name: Push changes - if: ${{ matrix.devbuild == 'enabled' }} - uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019 - with: - github_token: ${{ secrets.API_GITHUB_TOKEN }} - repository: "LingmoOS/lingmo-nightly-build" - directory: "./pkg_site" - branch: 'main' - force: true \ No newline at end of file + - name: Push changes + if: ${{ matrix.devbuild == 'enabled' }} + uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019 + with: + github_token: ${{ secrets.API_GITHUB_TOKEN }} + repository: "LingmoOS/lingmo-nightly-build" + directory: "./pkg_site" + branch: 'main' + force: true \ No newline at end of file From fd2411c8d9e4e39a4a5f5637e307ed7f0ba3e014 Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:49:09 +0800 Subject: [PATCH 4/7] Adding lingmo-workspace-base --- Configs/lingmo-workspace-base.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Configs/lingmo-workspace-base.json diff --git a/Configs/lingmo-workspace-base.json b/Configs/lingmo-workspace-base.json new file mode 100644 index 0000000..f928db7 --- /dev/null +++ b/Configs/lingmo-workspace-base.json @@ -0,0 +1,6 @@ +{ + "Name": "lingmo-workspace-base", + "Repository": "https://github.com/LingmoOS/lingmo-workspace-base.git", + "BuildType": "Debian", + "Tag": "2.0.1-0" +} \ No newline at end of file From 0082d2259f159ccd693b9115daf9918d5e7c9f81 Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:53:01 +0800 Subject: [PATCH 5/7] Disable upload for pr --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfe1fbd..76b3f33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,14 +64,14 @@ jobs: compression-level: 9 # maximum compression - name: Prepare envs - if: ${{ matrix.devbuild == 'enabled' }} + if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} run: | sudo apt update && sudo apt install reprepro gnupg echo "${{ secrets.GPG_SIGN_KEY }}" >> key.key gpg --import key.key - name: Clone & Update repo - if: ${{ matrix.devbuild == 'enabled' }} + if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} run: | git clone https://github.com/LingmoOS/lingmo-nightly-build.git pkg_site DEB_FILE_DIR="$(pwd)/BuildArtifacts" @@ -90,7 +90,7 @@ jobs: cd .. - name: Push changes - if: ${{ matrix.devbuild == 'enabled' }} + if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019 with: github_token: ${{ secrets.API_GITHUB_TOKEN }} From e48479404e8df07ff5e19399305a6e9ab64730a5 Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:56:24 +0800 Subject: [PATCH 6/7] !(github.event_name == 'pull_request') && --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76b3f33..280f190 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,14 +64,14 @@ jobs: compression-level: 9 # maximum compression - name: Prepare envs - if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} + if: ${{ !(github.event_name == 'pull_request') && matrix.devbuild == 'enabled' }} run: | sudo apt update && sudo apt install reprepro gnupg echo "${{ secrets.GPG_SIGN_KEY }}" >> key.key gpg --import key.key - name: Clone & Update repo - if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} + if: ${{ !(github.event_name == 'pull_request') && matrix.devbuild == 'enabled' }} run: | git clone https://github.com/LingmoOS/lingmo-nightly-build.git pkg_site DEB_FILE_DIR="$(pwd)/BuildArtifacts" @@ -90,7 +90,7 @@ jobs: cd .. - name: Push changes - if: ${{ !github.event.issue.pull_request && matrix.devbuild == 'enabled' }} + if: ${{ !(github.event_name == 'pull_request') && matrix.devbuild == 'enabled' }} uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019 with: github_token: ${{ secrets.API_GITHUB_TOKEN }} From fb071ea1cbb352ca855db0e1fbea7e2d28a18ffb Mon Sep 17 00:00:00 2001 From: Elysia Date: Sat, 19 Oct 2024 00:57:04 +0800 Subject: [PATCH 7/7] Fix branch name --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 280f190..1a9dfa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,8 +84,8 @@ jobs: git config --global user.email "automation@lingmo.org" git config --global user.name "Lingmo Automation Packer" git add . && git commit -m "Update Packages By Actions" - git branch -D master - git branch -m master + git branch -D main + git branch -m main cd ..