From 3110adefea9e42787918425509b89dc1fb7d68e5 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 24 Apr 2025 21:16:29 +0900 Subject: [PATCH 001/139] DRAFT for the generating debian package of circle-interpreter with binary files only ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/changelog | 4 +- .../circle-interpreter.install | 20 ++++---- .../circle-interpreter.lintian-overrides | 1 + infra/debian/circle-interpreter/compat | 2 +- infra/debian/circle-interpreter/control | 10 ++-- infra/debian/circle-interpreter/copyright | 15 +++++- infra/debian/circle-interpreter/make-cirint | 36 ++++++++++++++ infra/debian/circle-interpreter/rules | 49 +++++++++++-------- infra/debian/circle-interpreter/source/format | 1 + .../source/lintian-overrides | 26 ++++++++++ 10 files changed, 126 insertions(+), 38 deletions(-) create mode 100644 infra/debian/circle-interpreter/circle-interpreter.lintian-overrides create mode 100755 infra/debian/circle-interpreter/make-cirint create mode 100644 infra/debian/circle-interpreter/source/format create mode 100644 infra/debian/circle-interpreter/source/lintian-overrides diff --git a/infra/debian/circle-interpreter/changelog b/infra/debian/circle-interpreter/changelog index 339e0b81d64..daaa6b7159c 100644 --- a/infra/debian/circle-interpreter/changelog +++ b/infra/debian/circle-interpreter/changelog @@ -1,5 +1,5 @@ -circle-interpreter (1.30.0) jammy; urgency=low +circle-interpreter (1.30.0) focal; urgency=low * First circle-interpreter Debian package release for developers. - -- Saehie Park Mon, 23 Apr 2025 10:10:00 +0900 + -- SeunghoPark Thu, 24 Apr 2025 16:07:00 +0900 diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index eb6da70d989..241c7f55b07 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -1,13 +1,13 @@ # {FILES_TO_INSTALL} {DEST_DIR} # bin -usr/bin/circle-interpreter usr/share/cirint/bin/ +bin/circle-interpreter usr/share/cirint/bin/ # lib -usr/lib/libloco.so usr/share/cirint/bin/ -usr/lib/libluci_env.so usr/share/cirint/bin/ -usr/lib/libluci_import.so usr/share/cirint/bin/ -usr/lib/libluci_interpreter.so usr/share/cirint/bin/ -usr/lib/libluci_lang.so usr/share/cirint/bin/ -usr/lib/libluci_logex.so usr/share/cirint/bin/ -usr/lib/libluci_log.so usr/share/cirint/bin/ -usr/lib/libluci_plan.so usr/share/cirint/bin/ -usr/lib/libluci_profile.so usr/share/cirint/bin/ +lib/libloco.so usr/share/cirint/bin/ +lib/libluci_env.so usr/share/cirint/bin/ +lib/libluci_import.so usr/share/cirint/bin/ +lib/libluci_interpreter.so usr/share/cirint/bin/ +lib/libluci_lang.so usr/share/cirint/bin/ +lib/libluci_logex.so usr/share/cirint/bin/ +lib/libluci_log.so usr/share/cirint/bin/ +lib/libluci_plan.so usr/share/cirint/bin/ +lib/libluci_profile.so usr/share/cirint/bin/ diff --git a/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides b/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides new file mode 100644 index 00000000000..0573de0ab0a --- /dev/null +++ b/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides @@ -0,0 +1 @@ +circle-interpreter: binary-without-manpage diff --git a/infra/debian/circle-interpreter/compat b/infra/debian/circle-interpreter/compat index ec635144f60..48082f72f08 100644 --- a/infra/debian/circle-interpreter/compat +++ b/infra/debian/circle-interpreter/compat @@ -1 +1 @@ -9 +12 diff --git a/infra/debian/circle-interpreter/control b/infra/debian/circle-interpreter/control index 4e0392552aa..d058c7ce3f0 100644 --- a/infra/debian/circle-interpreter/control +++ b/infra/debian/circle-interpreter/control @@ -1,11 +1,15 @@ Source: circle-interpreter Section: devel Priority: optional -Build-Depends: devscripts, debhelper, cmake +Build-Depends: debhelper (>= 12), cmake Maintainer: Neural Network Acceleration Solution Developers +Standards-Version: 4.5.0 +Homepage: https://github.com/Samsung/ONE Package: circle-interpreter -Homepage: https://github.com/Samsung/ONE -Standards-Version: 3.9.8 Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Interpreter for circle model + Circle is a lightweight neural network model format developed in the ONE project. + This package provides the 'circle-interpreter' tool, which runs inference on + Circle models for validation and testing purposes. diff --git a/infra/debian/circle-interpreter/copyright b/infra/debian/circle-interpreter/copyright index a792fe45aab..1717bb3da3f 100644 --- a/infra/debian/circle-interpreter/copyright +++ b/infra/debian/circle-interpreter/copyright @@ -1,3 +1,14 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: circle-interpreter +Source: https://github.com/Samsung/ONE +Comment: These binaries are built from the ONE project. + Files: * -License: Proprietary -Copyright (c) <2025> +Copyright: 2025 Samsung Electronics., Ltd. +License: Apache-2.0 + This package is licensed under the Apache License, Version 2.0. + . + On Debian systems, the full text of the Apache License Version 2.0 + can be found in: + /usr/share/common-licenses/Apache-2.0 + diff --git a/infra/debian/circle-interpreter/make-cirint b/infra/debian/circle-interpreter/make-cirint new file mode 100755 index 00000000000..0221602dc83 --- /dev/null +++ b/infra/debian/circle-interpreter/make-cirint @@ -0,0 +1,36 @@ +#!/usr/bin/make -f + +CURRENT_DIR=$(shell pwd) +export NNCC_WORKSPACE=build/debian +export NNCC_INSTALL_PREFIX=${CURRENT_DIR}/${NNCC_WORKSPACE}.install + +%: + dh $@ + +debian-clean: + rm -rf build + +debian-configure: + CIRCLEINT_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};oops;loco;logo-core;logo;locop" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};hermes;hermes-std;safemain;mio-circle08" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};luci-compute;luci;luci-interpreter" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};foder;arser;vconone;circle-interpreter" + + ./nncc configure \ + -DENABLE_STRICT_BUILD=ON \ + -DENABLE_TEST=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DEXTERNALS_BUILD_THREADS=4 \ + -DCMAKE_INSTALL_PREFIX=${NNCC_INSTALL_PREFIX} \ + -DBUILD_WHITELIST="${CIRCLEINT_ITEMS}" + +debian-build: + ./nncc build -j16 + +debian-test: + # skip test + +debian-install: + ./nncc install + diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 91e39d0bd6d..2c6df8bb1c4 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,40 +1,49 @@ #!/usr/bin/make -f -export NNCC_WORKSPACE=build/debian -export NNCC_INSTALL_PREFIX=$(CURDIR)/debian/tmp/usr/ +export NNCC_INSTALL_PREFIX=$(CURDIR)/build/debian.install +export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: dh $@ override_dh_auto_clean: - # skip clean + # Nothing to clean + true override_dh_auto_configure: - CIRCLEINT_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};oops;loco;logo-core;logo;locop" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};hermes;hermes-std;safemain;mio-circle08" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};luci-compute;luci;luci-interpreter" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};foder;arser;vconone;circle-interpreter" - - ./nncc configure \ - -DENABLE_STRICT_BUILD=ON \ - -DENABLE_TEST=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DEXTERNALS_BUILD_THREADS=4 \ - -DCMAKE_INSTALL_PREFIX=${NNCC_INSTALL_PREFIX} \ - -DBUILD_WHITELIST="${CIRCLEINT_ITEMS}" + # No configure step needed + true override_dh_auto_build: - ./nncc build -j4 + # No build step needed + true override_dh_auto_test: - # skip test + # No test step needed + true override_dh_auto_install: - cmake --build ${NNCC_WORKSPACE} -- install + # copy the bin file + mkdir -p ${DEBIAN_PREFIX}/bin + cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ + + # copy the lib files + mkdir -p ${DEBIAN_PREFIX}/lib + cp ${NNCC_INSTALL_PREFIX}/lib/libloco.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ${DEBIAN_PREFIX}/lib/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info +override_dh_strip: + dh_strip --no-automatic-dbgsym + override_dh_builddeb: - dh_builddeb -- -Zgzip + dh_builddeb diff --git a/infra/debian/circle-interpreter/source/format b/infra/debian/circle-interpreter/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/infra/debian/circle-interpreter/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/infra/debian/circle-interpreter/source/lintian-overrides b/infra/debian/circle-interpreter/source/lintian-overrides new file mode 100644 index 00000000000..2fabb7a90d8 --- /dev/null +++ b/infra/debian/circle-interpreter/source/lintian-overrides @@ -0,0 +1,26 @@ +circle-interpreter source: source-is-missing build/debian.install/bin/circle-eval-diff +circle-interpreter source: source-is-missing build/debian.install/bin/circle-interpreter +circle-interpreter source: source-is-missing build/debian.install/bin/circle-mpqsolver +circle-interpreter source: source-is-missing build/debian.install/bin/circle-operator +circle-interpreter source: source-is-missing build/debian.install/bin/circle-opselector +circle-interpreter source: source-is-missing build/debian.install/bin/circle-partitioner +circle-interpreter source: source-is-missing build/debian.install/bin/circle-quantizer +circle-interpreter source: source-is-missing build/debian.install/bin/circle-resizer +circle-interpreter source: source-is-missing build/debian.install/bin/circle-tensordump +circle-interpreter source: source-is-missing build/debian.install/bin/circle2circle +circle-interpreter source: source-is-missing build/debian.install/bin/circle_execution_plan +circle-interpreter source: source-is-missing build/debian.install/bin/circle_input_names +circle-interpreter source: source-is-missing build/debian.install/bin/circle_part_driver +circle-interpreter source: source-is-missing build/debian.install/bin/circledump +circle-interpreter source: source-is-missing build/debian.install/bin/dalgona +circle-interpreter source: source-is-missing build/debian.install/bin/fme-apply +circle-interpreter source: source-is-missing build/debian.install/bin/fme-detect +circle-interpreter source: source-is-missing build/debian.install/bin/luci_eval_driver +circle-interpreter source: source-is-missing build/debian.install/bin/one-version +circle-interpreter source: source-is-missing build/debian.install/bin/q-implant +circle-interpreter source: source-is-missing build/debian.install/bin/record-minmax +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-file +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-reverse +circle-interpreter source: source-is-missing build/debian.install/bin/tflite2circle + From 79331b9201d4b186ff4c13f58cbc74cd1c19bb9d Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:36:56 +0900 Subject: [PATCH 002/139] Use the quilt method for packaging ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/debian/circle-interpreter/source/format b/infra/debian/circle-interpreter/source/format index 89ae9db8f88..163aaf8d82b 100644 --- a/infra/debian/circle-interpreter/source/format +++ b/infra/debian/circle-interpreter/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) From 7f0c655bf31d9384a00e95bfa143f9de1bd86d3f Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:54:47 +0900 Subject: [PATCH 003/139] Revise the rules to copy .so files directly from original source ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/rules | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 2c6df8bb1c4..50b482b4942 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -26,18 +26,6 @@ override_dh_auto_install: # copy the bin file mkdir -p ${DEBIAN_PREFIX}/bin cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ - - # copy the lib files - mkdir -p ${DEBIAN_PREFIX}/lib - cp ${NNCC_INSTALL_PREFIX}/lib/libloco.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ${DEBIAN_PREFIX}/lib/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info From e1a914dc22b84242b50788b22f491ec7c9b9398f Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:58:19 +0900 Subject: [PATCH 004/139] Revise the rules to copy .so files directly from original source ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../circle-interpreter.install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index 241c7f55b07..c42f00e895e 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -2,12 +2,12 @@ # bin bin/circle-interpreter usr/share/cirint/bin/ # lib -lib/libloco.so usr/share/cirint/bin/ -lib/libluci_env.so usr/share/cirint/bin/ -lib/libluci_import.so usr/share/cirint/bin/ -lib/libluci_interpreter.so usr/share/cirint/bin/ -lib/libluci_lang.so usr/share/cirint/bin/ -lib/libluci_logex.so usr/share/cirint/bin/ -lib/libluci_log.so usr/share/cirint/bin/ -lib/libluci_plan.so usr/share/cirint/bin/ -lib/libluci_profile.so usr/share/cirint/bin/ +build/debian.install/lib/libloco.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_env.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_import.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_interpreter.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_lang.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_logex.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_log.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_plan.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_profile.so usr/share/cirint/bin/ From 3880c4c0620a16c9dcd351181ff69115eef08616 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:58:32 +0900 Subject: [PATCH 005/139] Update the changelog ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/infra/debian/circle-interpreter/changelog b/infra/debian/circle-interpreter/changelog index daaa6b7159c..c06c28a8db0 100644 --- a/infra/debian/circle-interpreter/changelog +++ b/infra/debian/circle-interpreter/changelog @@ -1,3 +1,9 @@ +circle-interpreter (1.30.0~20250424.2227) focal; urgency=medium + + * Daily build with timestamp. + + -- SeunghoPark Thu, 24 Apr 2025 22:27:41 +0900 + circle-interpreter (1.30.0) focal; urgency=low * First circle-interpreter Debian package release for developers. From e2311841c780b5cf0d094c458c2a3a08816f6e70 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 11:49:56 +0900 Subject: [PATCH 006/139] Revise the build-circle-intp.yml workflow to test on private repo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 036f29d94f5..3848cbbc13f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -18,10 +18,11 @@ concurrency: jobs: onecc-test: - if: github.repository_owner == 'Samsung' + if: github.repository_owner == 'Samsung' || github.repository_owner == 'shs-park' strategy: matrix: - ubuntu_code: [ focal, jammy ] + # TODO activate jammy + ubuntu_code: [ focal ] include: - ubuntu_code: focal ubuntu_ver: 2004 @@ -30,13 +31,15 @@ jobs: - ubuntu_code: jammy ubuntu_ver: 2204 comment_id: 2658268060 - runs-on: ubuntu-latest + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: - NNCC_WORKSPACE : build - NNCC_INSTALL_PREFIX : install + NNCC_WORKSPACE : build/debian + NNCC_INSTALL_PREFIX : ${{ github.workspace }}/debian/tmp/usr/ name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: @@ -87,8 +90,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: circle_intp_${{ matrix.ubuntu_ver }} - # TODO enable retention-days, default is 90 - # retention-days: 3 + retention-days: 3 path: | ${{ env.NNCC_WORKSPACE }}/cirintp/ @@ -98,6 +100,7 @@ jobs: - name: Update URL if: false run: | + exit(1) # TODO enable posting comments echo "Artifact URL is ${{ steps.step-upload.outputs.artifact-url }}" COMMENT_ADDR=https://api.github.com/repos/Samsung/ONE/issues/comments/${{ matrix.comment_id }} curl -L \ From 6762817f5e371e39609c7d5285a459beca9da150 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:36:04 +0900 Subject: [PATCH 007/139] Fix the path ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3848cbbc13f..9ba8cc2cbc4 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -74,16 +74,16 @@ jobs: run: | cd ${NNCC_WORKSPACE} mkdir -p cirintp - cp -v ./${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. - name: Upload Artifact id: step-upload From 8934b8cb4d94d487722c0b2d64544db3048f7551 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:50:02 +0900 Subject: [PATCH 008/139] Use only focal in the matrix ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9ba8cc2cbc4..172da05869e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -22,15 +22,14 @@ jobs: strategy: matrix: # TODO activate jammy - ubuntu_code: [ focal ] include: - ubuntu_code: focal ubuntu_ver: 2004 # TODO update comment ID, these are experimental IDs of issue #14669 comment_id: 2658267907 - - ubuntu_code: jammy - ubuntu_ver: 2204 - comment_id: 2658268060 + # - ubuntu_code: jammy + # ubuntu_ver: 2204 + # comment_id: 2658268060 # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] From e60a5e1257ca716005ed09e8c961f492ed8e75b1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:52:53 +0900 Subject: [PATCH 009/139] Add a comment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 172da05869e..a1385439cb3 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -84,6 +84,7 @@ jobs: cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + # Doesn't actually need this step - name: Upload Artifact id: step-upload uses: actions/upload-artifact@v4 From 88741370ba4b857d16e2c3946b8e17a768061f37 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 15:27:15 +0900 Subject: [PATCH 010/139] Revise the path of each targets ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 36 +++++++++++-------- .../circle-interpreter.install | 18 +++++----- infra/debian/circle-interpreter/rules | 2 +- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index a1385439cb3..865cb2d5dc3 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -37,8 +37,10 @@ jobs: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: - NNCC_WORKSPACE : build/debian - NNCC_INSTALL_PREFIX : ${{ github.workspace }}/debian/tmp/usr/ + NNCC_BUILD: build + NNCC_WORKSPACE: build/debian + NNCC_INSTALL_PREFIX: ${{ github.workspace }}/debian.install + CIRINTP_PREFIX: cirintp name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: @@ -72,17 +74,17 @@ jobs: - name: Gather files run: | cd ${NNCC_WORKSPACE} - mkdir -p cirintp - cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + mkdir -p ${CIRINTP_PREFIX} + cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./${CIRINTP_PREFIX}/. # Doesn't actually need this step - name: Upload Artifact @@ -92,7 +94,13 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_WORKSPACE }}/cirintp/ + ${{ env.NNCC_WORKSPACE }}/${CIRINTP_PREFIX}/ + + - name: Create debian package + run: | + cd ${{ env.NNCC_BUILD }} + cp -rf infra/debian/circlr-interpreter ./debian + la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index c42f00e895e..3e97ee7f198 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -2,12 +2,12 @@ # bin bin/circle-interpreter usr/share/cirint/bin/ # lib -build/debian.install/lib/libloco.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_env.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_import.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_interpreter.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_lang.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_logex.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_log.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_plan.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_profile.so usr/share/cirint/bin/ +libloco.so usr/share/cirint/bin/ +libluci_env.so usr/share/cirint/bin/ +libluci_import.so usr/share/cirint/bin/ +libluci_interpreter.so usr/share/cirint/bin/ +libluci_lang.so usr/share/cirint/bin/ +libluci_logex.so usr/share/cirint/bin/ +libluci_log.so usr/share/cirint/bin/ +libluci_plan.so usr/share/cirint/bin/ +libluci_profile.so usr/share/cirint/bin/ diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 50b482b4942..004439a8eda 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export NNCC_INSTALL_PREFIX=$(CURDIR)/build/debian.install +export NNCC_INSTALL_PREFIX=$(CURDIR)/debian.install export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: From 44a707fc9a098e1b442268500e825218e2b5d938 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 09:26:25 +0900 Subject: [PATCH 011/139] Add inputs to the workflow. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 865cb2d5dc3..5ce8c1c2230 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -6,6 +6,14 @@ on: # # 05:00 AM (KST, UTC+9:00) Mon-Fri # - cron: '00 20 * * 0-4' workflow_dispatch: + inputs: + cirint_version: + description: 'The version of circle-interpreter' + required: true + default: '1.30.0' + cirint_description: + description: 'Description of changelog for circle-interpreter' + required: true defaults: run: From 9fcc3d30c3c611ce42d12bf02eba01e61c47cfb3 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 13:20:15 +0900 Subject: [PATCH 012/139] Fix a typo.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 5ce8c1c2230..8028d59566a 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,7 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} - cp -rf infra/debian/circlr-interpreter ./debian + cp -rf infra/debian/circle-interpreter ./debian la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 1822403fbf7996007d029a1bf65aeae18cece4bf Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:14:01 +0900 Subject: [PATCH 013/139] Fix the path of build directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8028d59566a..613fc73ff64 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,7 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} - cp -rf infra/debian/circle-interpreter ./debian + cp -rf ../infra/debian/circle-interpreter ./debian la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 71a668c4350e650492469568b2be577dba84927d Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:15:09 +0900 Subject: [PATCH 014/139] chmod -x make-cirint ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/make-cirint | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 infra/debian/circle-interpreter/make-cirint diff --git a/infra/debian/circle-interpreter/make-cirint b/infra/debian/circle-interpreter/make-cirint old mode 100755 new mode 100644 From b2dba1e50712cc872740640fa773d39ea9c1e654 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:31:53 +0900 Subject: [PATCH 015/139] Fix path and typo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 613fc73ff64..d76fcb19456 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -81,7 +81,7 @@ jobs: - name: Gather files run: | - cd ${NNCC_WORKSPACE} + cd ${NNCC_BUILD} mkdir -p ${CIRINTP_PREFIX} cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./${CIRINTP_PREFIX}/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./${CIRINTP_PREFIX}/. @@ -102,13 +102,13 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_WORKSPACE }}/${CIRINTP_PREFIX}/ + ${{ env.NNCC_BUILD }}/${CIRINTP_PREFIX}/ - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} cp -rf ../infra/debian/circle-interpreter ./debian - la -alh # TODO remove this + ls -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From 6ef30aac53daaa04df9c0558fc70a8a9acea2fb0 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:54:49 +0900 Subject: [PATCH 016/139] Add some release related work ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d76fcb19456..ca8ba951a47 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -102,13 +102,21 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/${CIRINTP_PREFIX}/ + ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} cp -rf ../infra/debian/circle-interpreter ./debian ls -alh # TODO remove this + release_date=$(date +%Y%m%d) + version=${{ inputs.cirint_version }}~${release_date} + tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + dch -v "${version}" "${{ inputs.cirint_description }}" -b + cat debian/changelog # TODO remove this + debuild -S -sa + ls -alh # TODO remove this + # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From 79b8f142749dbee1221ebd1e4b2978baf4544524 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 15:36:57 +0900 Subject: [PATCH 017/139] Revise build directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ca8ba951a47..d4295a53619 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -46,8 +46,8 @@ jobs: options: --user root env: NNCC_BUILD: build - NNCC_WORKSPACE: build/debian - NNCC_INSTALL_PREFIX: ${{ github.workspace }}/debian.install + NNCC_WORKSPACE: build/release + NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} From 81f960f3bd21a5dc1d7498c12b20a9abee10cbe6 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 17:56:20 +0900 Subject: [PATCH 018/139] Reorder some debian related commands ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d4295a53619..ff758c4bf94 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -106,16 +106,22 @@ jobs: - name: Create debian package run: | - cd ${{ env.NNCC_BUILD }} - cp -rf ../infra/debian/circle-interpreter ./debian + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} - tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this + + cd ${{ env.NNCC_BUILD }} + tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} debuild -S -sa ls -alh # TODO remove this + cd ${{ env.NNCC_BUILD }} # TODO remove this + ls -alh # TODO remove this # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 4fa910ff0c72b036d435228a76fa2f9c89dddf1e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 18:53:56 +0900 Subject: [PATCH 019/139] Add some debug code ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ff758c4bf94..b5755bdaaf2 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,6 +107,8 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + pwd # TODO remove this + ls -alh # TODO remove this cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) From 3bd16990553c86b826d0270daa760bdcab19557c Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:03:05 +0900 Subject: [PATCH 020/139] Fix the path access ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index b5755bdaaf2..3b188fdede1 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,9 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} - pwd # TODO remove this - ls -alh # TODO remove this - cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian + cp -rf ../../infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} From 481b15ec094436cd94293501bc5a42f983d653dd Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:28:08 +0900 Subject: [PATCH 021/139] Fix Path ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3b188fdede1..f6b113225d5 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -114,13 +114,13 @@ jobs: dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this - cd ${{ env.NNCC_BUILD }} + cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} - cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa ls -alh # TODO remove this - cd ${{ env.NNCC_BUILD }} # TODO remove this + cd ../ # TODO remove this ls -alh # TODO remove this # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes From 18453ea9f4afc2637de7b31ee1ab862b3447fd07 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:58:48 +0900 Subject: [PATCH 022/139] Add author and email for the dch command ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f6b113225d5..48aaa26703c 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -14,6 +14,14 @@ on: cirint_description: description: 'Description of changelog for circle-interpreter' required: true + deb_fullname: + description: 'Full name of Debian package author' + required: false + default: 'On-device AI developers' + deb_email: + description: 'Email address of Debian package author' + required: false + default: 'nnfw@samsung.com' defaults: run: @@ -108,9 +116,10 @@ jobs: run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian - ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} + export DEBFULLNAME="${{ inputs.deb_fullname }}" + export DEBEMAIL="${{ inputs.deb_email }}" dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this @@ -119,9 +128,7 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa - ls -alh # TODO remove this - cd ../ # TODO remove this - ls -alh # TODO remove this + # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From a00d1c5f27be854cc48e41d5d9ec498fc34236f8 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 20:34:06 +0900 Subject: [PATCH 023/139] Use secret key ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 48aaa26703c..9c202582144 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -120,7 +120,7 @@ jobs: version=${{ inputs.cirint_version }}~${release_date} export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${version}" "${{ inputs.cirint_description }}" -b + dch -v "${version}" --distribution "${{ matrix.ubuntu_code }}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this cd ../ @@ -129,6 +129,12 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa + cd ../ + ls -alh # TODO remove this + mkdir -p ~/.ssh + echo "${{ secrets.LAUNCHPAD_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 1007de10efc23f5b13bca3c81add40dae9b11666 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 20:50:06 +0900 Subject: [PATCH 024/139] Add private keys ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9c202582144..35fadef3075 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -126,13 +126,17 @@ jobs: cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + mkdir -p ~/.gnupg + chmod 700 ~/.gnupg + echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import + gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa cd ../ ls -alh # TODO remove this mkdir -p ~/.ssh - echo "${{ secrets.LAUNCHPAD_PRIVATE_KEY }}" > ~/.ssh/id_rsa + echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes From 1b16a2fff1d910c6de315b317da06180980f03f5 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 10:49:07 +0900 Subject: [PATCH 025/139] Add debug log ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 35fadef3075..dffc6d58e12 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -114,6 +114,7 @@ jobs: - name: Create debian package run: | + echo "Update changelog" cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian release_date=$(date +%Y%m%d) @@ -126,6 +127,7 @@ jobs: cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + echo "debuild: signing with the gpg key" mkdir -p ~/.gnupg chmod 700 ~/.gnupg echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import @@ -133,6 +135,7 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa + echo "Upload to Launchpad" cd ../ ls -alh # TODO remove this mkdir -p ~/.ssh From 09affcfbc3c33287a470dddf7b3d91fa7e7bf887 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 14:24:46 +0900 Subject: [PATCH 026/139] revise the usage of debuild ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index dffc6d58e12..1985040919e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -133,7 +133,11 @@ jobs: echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - debuild -S -sa + GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + DEBSIGN_PROGRAM=gpg \ + DEBSIGN_KEYID=${GPG_KEY_ID} \ + GPG_TTY=$(tty) \ + debuild -S -sa echo "Upload to Launchpad" cd ../ From 7bf6a3518e7f2e99c346b3aa082636c13713fc91 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 14:45:21 +0900 Subject: [PATCH 027/139] Revise debuild envrironment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 1985040919e..4c3088194ed 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -134,10 +134,16 @@ jobs: gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + echo "$GPG_KEY_ID:6:" | gpg --import-ownertrust + echo "use-agent" >> ~/.gnupg/gpg.conf + echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + export DEBSIGN_KEYID=${GPG_KEY_ID} + export GPG_TTY=$(tty) + gpgconf --kill gpg-agent + gpgconf --launch gpg-agent DEBSIGN_PROGRAM=gpg \ - DEBSIGN_KEYID=${GPG_KEY_ID} \ - GPG_TTY=$(tty) \ - debuild -S -sa + debuild -S -sa --no-lintian --sign-key=$GPG_KEY_ID echo "Upload to Launchpad" cd ../ From 79ddb739a4c8be4227ff7b8f8189fd6279a1c68e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:05:16 +0900 Subject: [PATCH 028/139] Revise the debuild environment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 4c3088194ed..8ad29d96fc5 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -134,7 +134,9 @@ jobs: gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - echo "$GPG_KEY_ID:6:" | gpg --import-ownertrust + # get fingerprint + FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') + echo "$FPR:6:" | gpg --import-ownertrust echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf @@ -143,7 +145,7 @@ jobs: gpgconf --kill gpg-agent gpgconf --launch gpg-agent DEBSIGN_PROGRAM=gpg \ - debuild -S -sa --no-lintian --sign-key=$GPG_KEY_ID + debuild -S -sa --sign-key=$GPG_KEY_ID echo "Upload to Launchpad" cd ../ From 496a043d55c0c5f97d88698944f23fd4c50b53e1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:12:48 +0900 Subject: [PATCH 029/139] reorder some lines ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8ad29d96fc5..f0e621a5270 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -133,13 +133,13 @@ jobs: echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${GPG_KEY_ID} export GPG_TTY=$(tty) gpgconf --kill gpg-agent From 89dd94429741afcd8da2925eca1baa8475eff9ef Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:19:55 +0900 Subject: [PATCH 030/139] Revise debuild env.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f0e621a5270..3a252d71fb9 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -128,24 +128,28 @@ jobs: tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} echo "debuild: signing with the gpg key" - mkdir -p ~/.gnupg - chmod 700 ~/.gnupg + echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} + # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust + + mkdir -p ~/.gnupg + chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - export DEBSIGN_KEYID=${GPG_KEY_ID} - export GPG_TTY=$(tty) gpgconf --kill gpg-agent gpgconf --launch gpg-agent - DEBSIGN_PROGRAM=gpg \ - debuild -S -sa --sign-key=$GPG_KEY_ID + + #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + export DEBSIGN_KEYID=${FPR} + export GPG_TTY="" + export DEBSIGN_PROGRAM=gpg + debuild -S -sa --sign-key=${FPR} echo "Upload to Launchpad" cd ../ From cf24d28b9b9b592f667582958be612f33b35df96 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 18:22:17 +0900 Subject: [PATCH 031/139] Add no-tty option to the gpg.conf ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3a252d71fb9..9ae412dc8f0 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,6 +141,7 @@ jobs: chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + echo "no-tty" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From fb70b6729b30b13011d9ff1db4c5c173e038e833 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 18:52:00 +0900 Subject: [PATCH 032/139] Revise to use GPG_AGENT_INFO=1 ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9ae412dc8f0..fc2d5a81f1f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -149,6 +149,7 @@ jobs: #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${FPR} export GPG_TTY="" + export GPG_AGENT_INFO=1 export DEBSIGN_PROGRAM=gpg debuild -S -sa --sign-key=${FPR} From 6d134edceb580df9a9baac150b348c5426c023b7 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:02:03 +0900 Subject: [PATCH 033/139] Retry ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index fc2d5a81f1f..ce4b2ad621c 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,14 +141,14 @@ jobs: chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - echo "no-tty" >> ~/.gnupg/gpg.conf + # echo "no-tty" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${FPR} - export GPG_TTY="" + #export GPG_TTY="" export GPG_AGENT_INFO=1 export DEBSIGN_PROGRAM=gpg debuild -S -sa --sign-key=${FPR} From da9a4dae322b11d5a50ab66b93de70357adc777b Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:12:26 +0900 Subject: [PATCH 034/139] add batch option ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ce4b2ad621c..1eb1ad12720 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -142,6 +142,7 @@ jobs: echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf # echo "no-tty" >> ~/.gnupg/gpg.conf + echo "batch" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From c7ae9181d17888500dd4b43cfc26c30b04dfac61 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:24:34 +0900 Subject: [PATCH 035/139] retry.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 1eb1ad12720..d90f20f567b 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -140,10 +140,11 @@ jobs: mkdir -p ~/.gnupg chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf - echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - # echo "no-tty" >> ~/.gnupg/gpg.conf + #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf + #echo "no-tty" >> ~/.gnupg/gpg.conf echo "batch" >> ~/.gnupg/gpg.conf - echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From 1d9a3912374da87c9d370660bd3ec3f9fc27845d Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:14:16 +0900 Subject: [PATCH 036/139] retry with debsign ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 40 ++++++++++++++----------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d90f20f567b..a79a888ede2 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,7 +129,8 @@ jobs: echo "debuild: signing with the gpg key" - echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import + #echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --import + echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} @@ -137,23 +138,26 @@ jobs: FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - mkdir -p ~/.gnupg - chmod 700 ~/.gnupg - echo "use-agent" >> ~/.gnupg/gpg.conf - #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf - #echo "no-tty" >> ~/.gnupg/gpg.conf - echo "batch" >> ~/.gnupg/gpg.conf - #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - gpgconf --kill gpg-agent - gpgconf --launch gpg-agent - - #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - export DEBSIGN_KEYID=${FPR} - #export GPG_TTY="" - export GPG_AGENT_INFO=1 - export DEBSIGN_PROGRAM=gpg - debuild -S -sa --sign-key=${FPR} + debuild -S -us -uc + debsign -k${FPR} ../circle-interpreter_*.changes + + # mkdir -p ~/.gnupg + # chmod 700 ~/.gnupg + # echo "use-agent" >> ~/.gnupg/gpg.conf + # #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf + # #echo "no-tty" >> ~/.gnupg/gpg.conf + # echo "batch" >> ~/.gnupg/gpg.conf + # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + # gpgconf --kill gpg-agent + # gpgconf --launch gpg-agent + + # #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + # export DEBSIGN_KEYID=${FPR} + # #export GPG_TTY="" + # export GPG_AGENT_INFO=1 + # export DEBSIGN_PROGRAM=gpg + # debuild -S -sa --sign-key=${FPR} echo "Upload to Launchpad" cd ../ From 0ca1ff3d2493e6f5fdb5cadcc21cd142e8e6d862 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:23:33 +0900 Subject: [PATCH 037/139] Remove error generating line ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index a79a888ede2..4e3927a7249 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,7 +129,6 @@ jobs: echo "debuild: signing with the gpg key" - #echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --import echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} From 5a6a5de2ac3459d97d431d619c7116c6cf4baa96 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:42:56 +0900 Subject: [PATCH 038/139] Add debug log ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 4e3927a7249..fc2f99e06bd 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -137,7 +137,13 @@ jobs: FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust + echo "Reading.. gpg.conf" + cat ~/.gnupg/gpg.conf + + echo "Running.. debuild -S -us -uc" debuild -S -us -uc + + echo "Running.. debsign -k${FPR} ../circle-interpreter_*.changes" debsign -k${FPR} ../circle-interpreter_*.changes # mkdir -p ~/.gnupg From 1dbc78366fe04a0556f55f1e86356a2636f7307e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:59:29 +0900 Subject: [PATCH 039/139] Clean .gnupg directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index fc2f99e06bd..92ab44d4117 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,6 +129,9 @@ jobs: echo "debuild: signing with the gpg key" + echo "Remove.. gpg.conf" + rm -rf ~/.gnupg + echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} From abfc66e91f396c509ff9b134dd59b1bf68e32044 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:25:31 +0900 Subject: [PATCH 040/139] pass the cat error ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 92ab44d4117..6bf238e1761 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,7 +141,7 @@ jobs: echo "$FPR:6:" | gpg --import-ownertrust echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf + cat ~/.gnupg/gpg.conf | true echo "Running.. debuild -S -us -uc" debuild -S -us -uc From 733fcaa0a01be2261e3640c8c178af0a8406a4bd Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:34:22 +0900 Subject: [PATCH 041/139] Fix error; ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 6bf238e1761..783dfe22ef9 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,7 +141,7 @@ jobs: echo "$FPR:6:" | gpg --import-ownertrust echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf | true + cat ~/.gnupg/gpg.conf || true echo "Running.. debuild -S -us -uc" debuild -S -us -uc From af56a2b3fedd2e35b00e36cd86c5ce4489112985 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:52:47 +0900 Subject: [PATCH 042/139] debsign ok. upload artifacts ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 40 +++++++------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 783dfe22ef9..0862685ad8e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -113,6 +113,7 @@ jobs: ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - name: Create debian package + id: create-debian-package run: | echo "Update changelog" cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} @@ -128,45 +129,15 @@ jobs: tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} echo "debuild: signing with the gpg key" - - echo "Remove.. gpg.conf" rm -rf ~/.gnupg - echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import - gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - - echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf || true - - echo "Running.. debuild -S -us -uc" debuild -S -us -uc - - echo "Running.. debsign -k${FPR} ../circle-interpreter_*.changes" debsign -k${FPR} ../circle-interpreter_*.changes - # mkdir -p ~/.gnupg - # chmod 700 ~/.gnupg - # echo "use-agent" >> ~/.gnupg/gpg.conf - # #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf - # #echo "no-tty" >> ~/.gnupg/gpg.conf - # echo "batch" >> ~/.gnupg/gpg.conf - # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - # gpgconf --kill gpg-agent - # gpgconf --launch gpg-agent - - # #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - # export DEBSIGN_KEYID=${FPR} - # #export GPG_TTY="" - # export GPG_AGENT_INFO=1 - # export DEBSIGN_PROGRAM=gpg - # debuild -S -sa --sign-key=${FPR} - echo "Upload to Launchpad" cd ../ ls -alh # TODO remove this @@ -176,6 +147,15 @@ jobs: cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes + - name: Upload Artifact + id: upload-debian-package + uses: actions/upload-artifact@v4 + with: + name: circle-interpreter_${{ steps.create-debian-package.outputs.version }} + retention-days: 3 + path: | + ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.create-debian-package.outputs.version }}.orig.tar.xz + # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official # TODO enable update URL when key is available From 149539f2b37fdfbeacbeea02fd3d35ca94e8b6f3 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 22:33:36 +0900 Subject: [PATCH 043/139] Revise current implementation ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 56 +++++++++++++++---------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 0862685ad8e..8d645332a31 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -66,7 +66,7 @@ jobs: - name: Install required packages run: | apt-get update - apt-get install curl + apt-get install -y curl - name: Build without test run: | @@ -112,49 +112,63 @@ jobs: path: | ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - - name: Create debian package - id: create-debian-package + - name: Config files + id: config run: | - echo "Update changelog" - cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} - cp -rf ../../infra/debian/circle-interpreter ./debian release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} + changes_file="circle-interpreter_${version}_source.changes" + tarball_file="circle-interpreter_${version}.orig.tar.xz" + + echo "version=${version}" >> $GITHUB_OUTPUT + echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT + echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + + - name: Update changelog + run: | + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${version}" --distribution "${{ matrix.ubuntu_code }}" "${{ inputs.cirint_description }}" -b - cat debian/changelog # TODO remove this + dch -v "${{ steps.config.outputs.version }}" \ + --distribution "${{ matrix.ubuntu_code }}" \ + "${{ inputs.cirint_description }}" -b - cd ../ - tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + - name: Craete original tarball + run: | + cd ${{ env.NNCC_BUILD }} + tar -caf \ + circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz \ + ${{ env.CIRINTP_PREFIX }} - echo "debuild: signing with the gpg key" + - name: Signing with debuild and debsign + run: | + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} rm -rf ~/.gnupg echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import - cd ${{ env.CIRINTP_PREFIX }} # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust debuild -S -us -uc debsign -k${FPR} ../circle-interpreter_*.changes - echo "Upload to Launchpad" - cd ../ - ls -alh # TODO remove this + - name: Upload to Launchpad + run: | + cd ${{ env.NNCC_BUILD }} mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - cat ~/.ssh/id_rsa - # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes + # dput ppa:circletools/nightly \ + # circle-interpreter_${{ steps.config.outputs.version }}_source.changes - - name: Upload Artifact - id: upload-debian-package + - name: Upload artifact; circle-interpreter + id: upload uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ steps.create-debian-package.outputs.version }} + name: circle-interpreter_${{ steps.config.outputs.version }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.create-debian-package.outputs.version }}.orig.tar.xz + ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From d0e67fa761acb393bf62a625c833aa140cf343b5 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 22:45:31 +0900 Subject: [PATCH 044/139] Enable uploading to the Launchpad ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8d645332a31..44e784972ea 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -158,8 +158,8 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - # dput ppa:circletools/nightly \ - # circle-interpreter_${{ steps.config.outputs.version }}_source.changes + dput ppa:circletools/nightly \ + circle-interpreter_${{ steps.config.outputs.version }}_source.changes - name: Upload artifact; circle-interpreter id: upload From 637e51b2055046d500aab5038eb6c1cf12e7e713 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 09:54:45 +0900 Subject: [PATCH 045/139] Fix path of installing binaries ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 004439a8eda..1183a5fc656 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export NNCC_INSTALL_PREFIX=$(CURDIR)/debian.install +export NNCC_INSTALL_PREFIX=$(CURDIR) export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: @@ -25,7 +25,7 @@ override_dh_auto_test: override_dh_auto_install: # copy the bin file mkdir -p ${DEBIAN_PREFIX}/bin - cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ + cp ${NNCC_INSTALL_PREFIX}/circle-interpreter ${DEBIAN_PREFIX}/bin/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info From d174abf535745b6cbd34fd9dfb05ce7e4751da3a Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:42:36 +0900 Subject: [PATCH 046/139] Create the create-pr-on-success job ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 142 ++++++++++++++++-------- 1 file changed, 95 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 44e784972ea..f2b47b9e78f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -33,8 +33,30 @@ concurrency: cancel-in-progress: true jobs: - onecc-test: + prepare: if: github.repository_owner == 'Samsung' || github.repository_owner == 'shs-park' + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] + outputs: + version: ${{ steps.set-version.outputs.version }} + changes_file: ${{ steps.set-version.outputs.changes_file }} + tarball_file: ${{ steps.set-version.outputs.tarball_file }} + steps: + - name: Set version + id: set-version + run: | + release_date=$(date +%Y%m%d%H%M) + version=${{ inputs.cirint_version }}~${release_date} + changes_file="circle-interpreter_${version}_source.changes" + tarball_file="circle-interpreter_${version}.orig.tar.xz" + + echo "version=${version}" >> $GITHUB_OUTPUT + echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT + echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + + debian-release: + needs: prepare strategy: matrix: # TODO activate jammy @@ -46,6 +68,7 @@ jobs: # - ubuntu_code: jammy # ubuntu_ver: 2204 # comment_id: 2658268060 + name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] @@ -53,11 +76,13 @@ jobs: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: + VERSION: ${{ needs.prepare.outputs.version }} + CHANGE_FILE: ${{ needs.prepare.outputs.changes_file }} + TARBALL_FILE: ${{ needs.prepare.outputs.tarball_file }} NNCC_BUILD: build NNCC_WORKSPACE: build/release NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp - name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: - name: Checkout @@ -102,44 +127,20 @@ jobs: cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./${CIRINTP_PREFIX}/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./${CIRINTP_PREFIX}/. - # Doesn't actually need this step - - name: Upload Artifact - id: step-upload - uses: actions/upload-artifact@v4 - with: - name: circle_intp_${{ matrix.ubuntu_ver }} - retention-days: 3 - path: | - ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - - - name: Config files - id: config - run: | - release_date=$(date +%Y%m%d) - version=${{ inputs.cirint_version }}~${release_date} - changes_file="circle-interpreter_${version}_source.changes" - tarball_file="circle-interpreter_${version}.orig.tar.xz" - - echo "version=${version}" >> $GITHUB_OUTPUT - echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT - echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT - - name: Update changelog run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${{ steps.config.outputs.version }}" \ + dch -v "${{ env.VERSION }}" \ --distribution "${{ matrix.ubuntu_code }}" \ "${{ inputs.cirint_description }}" -b - name: Craete original tarball run: | cd ${{ env.NNCC_BUILD }} - tar -caf \ - circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz \ - ${{ env.CIRINTP_PREFIX }} + tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} - name: Signing with debuild and debsign run: | @@ -158,31 +159,78 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - dput ppa:circletools/nightly \ - circle-interpreter_${{ steps.config.outputs.version }}_source.changes + dput ppa:circletools/nightly ${{ env.CHANGE_FILE }} - name: Upload artifact; circle-interpreter id: upload uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ steps.config.outputs.version }} + name: circle-interpreter_${{ env.VERSION }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz + ${{ env.NNCC_BUILD }}/${{ env.TARBALL_FILE }} + + create-pr-on-success: + name: Create changelog update PR on success + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] + needs: [ prepare, debian-release ] + env: + VERSION: ${{ needs.prepare.outputs.version }} + # TODO need to activate the branch condition + # if: ${{ success() && github.ref == 'refs/heads/master' }} + if: ${{ success() }} + permissions: + contents: write + pull-requests: write - # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment - # TODO update comment id from experiment to official - # TODO enable update URL when key is available - - name: Update URL - if: false + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Git + run: | + git config --global user.name "Seungho Henry Park" + git config --global user.email "shs.park@samsung.com" + + - name: Download tarball + uses: actions/download-artifact@v4 + with: + name: circle-interpreter_${{ env.VERSION }} + + - name: Extract changelog + run: | + tar -xaf circle-interpreter_${VERSION}.orig.tar.xz + cp cirintp/debian/changelog \ + infra/debian/circle-interpreter/changelog + + - name: Create PR branch and commit changelog + run: | + BRANCH=auto/update-cirint-changelog-${{ env.VERSION }} + git checkout -b $BRANCH + git add infra/debian/circle-interpreter/changelog + git commit -m "[infra/debian] Update changelog for circle-interpreter" \ + -m "This updates the changelog for circle-interpreter_${{ env.VERSION }}." \ + -m "It is auto-generated PR from github workflow." \ + -m "" \ + -m "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park " + git push origin $BRANCH + + - name: Create PR + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - exit(1) # TODO enable posting comments - echo "Artifact URL is ${{ steps.step-upload.outputs.artifact-url }}" - COMMENT_ADDR=https://api.github.com/repos/Samsung/ONE/issues/comments/${{ matrix.comment_id }} - curl -L \ - -X PATCH \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.COMMENT_UPDATE_KEY }}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - ${COMMENT_ADDR} \ - -d '{"body":"${{ steps.step-upload.outputs.artifact-url }}"}' + gh pr create \ + --title "[infra/debian] Update changelog for circle-interpreter" \ + --body \ + "$(cat < + EOF + )" + --head $BRANCH \ + --base master From c0a0ac581209006376969801416f71baa946f7ee Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:51:52 +0900 Subject: [PATCH 047/139] Release Version - true/false ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f2b47b9e78f..58ff6073670 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -22,6 +22,12 @@ on: description: 'Email address of Debian package author' required: false default: 'nnfw@samsung.com' + is_release: + description: 'Is this a release version? \ + Set to false to append date-based subversion. \ + (true/false)' + required: false + default: 'false' defaults: run: @@ -46,8 +52,16 @@ jobs: - name: Set version id: set-version run: | - release_date=$(date +%Y%m%d%H%M) - version=${{ inputs.cirint_version }}~${release_date} + base_version="${{ inputs.cirint_version }}" + is_release="${{ inputs.is_release }}" + + if [[ "$is_release" == "true" ]]; then + version="$base_version" + else + release_date=$(date +%Y%m%d%H%M) + version="${base_version}~${release_date}" + fi + changes_file="circle-interpreter_${version}_source.changes" tarball_file="circle-interpreter_${version}.orig.tar.xz" From ec8583825421904af1ac0a7e6268c539891516ad Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:56:03 +0900 Subject: [PATCH 048/139] Fix new lines ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 58ff6073670..291177f9848 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -23,8 +23,8 @@ on: required: false default: 'nnfw@samsung.com' is_release: - description: 'Is this a release version? \ - Set to false to append date-based subversion. \ + description: 'Is this a release version? + Set to false to append date-based subversion. (true/false)' required: false default: 'false' From 6062338deb5c49b87daf9a3a2a12ca2370d222d6 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:59:26 +0900 Subject: [PATCH 049/139] Enable jammy distribution ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 291177f9848..8708467a15e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -77,11 +77,8 @@ jobs: include: - ubuntu_code: focal ubuntu_ver: 2004 - # TODO update comment ID, these are experimental IDs of issue #14669 - comment_id: 2658267907 - # - ubuntu_code: jammy - # ubuntu_ver: 2204 - # comment_id: 2658268060 + - ubuntu_code: jammy + ubuntu_ver: 2204 name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest From 742291d4761009ce4bbced36be2cdde400ef1778 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:24:38 +0900 Subject: [PATCH 050/139] Fix duplicated artifact issue ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8708467a15e..c12c5ad7ffb 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -77,8 +77,10 @@ jobs: include: - ubuntu_code: focal ubuntu_ver: 2004 + upload_artifact: false - ubuntu_code: jammy ubuntu_ver: 2204 + upload_artifact: true # only this artifact will be shared name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest @@ -149,6 +151,7 @@ jobs: "${{ inputs.cirint_description }}" -b - name: Craete original tarball + if: matrix.upload_artifact == true run: | cd ${{ env.NNCC_BUILD }} tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} @@ -161,7 +164,11 @@ jobs: # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - debuild -S -us -uc + if [[ "${{ matrix.upload_artifact }}" == "true" ]]; then + debuild -S -us -uc + else + debuild -S -us -uc -sd # without *.orig.tar.xz + fi debsign -k${FPR} ../circle-interpreter_*.changes - name: Upload to Launchpad @@ -173,7 +180,7 @@ jobs: dput ppa:circletools/nightly ${{ env.CHANGE_FILE }} - name: Upload artifact; circle-interpreter - id: upload + if: matrix.upload_artifact == true uses: actions/upload-artifact@v4 with: name: circle-interpreter_${{ env.VERSION }} From 0e66aeeedd9c6b5382cd14c91e989c3a507169af Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:48:19 +0900 Subject: [PATCH 051/139] Add docker credential and remove if statement for generating tarball ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index c12c5ad7ffb..b77a260d342 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -87,6 +87,9 @@ jobs: runs-on: [ self-hosted, shs-park ] container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} + credentials: + username: ${{ secrets.NNFW_DOCKERHUB_USERNAME }} + password: ${{ secrets.NNFW_DOCKERHUB_TOKEN }} options: --user root env: VERSION: ${{ needs.prepare.outputs.version }} @@ -151,7 +154,6 @@ jobs: "${{ inputs.cirint_description }}" -b - name: Craete original tarball - if: matrix.upload_artifact == true run: | cd ${{ env.NNCC_BUILD }} tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} From e2ea3fb962e70cb4e0b0fd23d7648f7d469bcec5 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:50:45 +0900 Subject: [PATCH 052/139] revise credential names ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index b77a260d342..8eca1ff29bd 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -88,8 +88,8 @@ jobs: container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} credentials: - username: ${{ secrets.NNFW_DOCKERHUB_USERNAME }} - password: ${{ secrets.NNFW_DOCKERHUB_TOKEN }} + username: ${{ secrets.NNFW_DOCKER_USERNAME }} + password: ${{ secrets.NNFW_DOCKER_TOKEN }} options: --user root env: VERSION: ${{ needs.prepare.outputs.version }} From ec8e0c2d6fe40ef300f36f5790c23f4fcc59b75a Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 24 Apr 2025 21:16:29 +0900 Subject: [PATCH 053/139] DRAFT for the generating debian package of circle-interpreter with binary files only ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/changelog | 4 +- .../circle-interpreter.install | 20 ++++---- .../circle-interpreter.lintian-overrides | 1 + infra/debian/circle-interpreter/compat | 2 +- infra/debian/circle-interpreter/control | 10 ++-- infra/debian/circle-interpreter/copyright | 15 +++++- infra/debian/circle-interpreter/make-cirint | 36 ++++++++++++++ infra/debian/circle-interpreter/rules | 49 +++++++++++-------- infra/debian/circle-interpreter/source/format | 1 + .../source/lintian-overrides | 26 ++++++++++ 10 files changed, 126 insertions(+), 38 deletions(-) create mode 100644 infra/debian/circle-interpreter/circle-interpreter.lintian-overrides create mode 100755 infra/debian/circle-interpreter/make-cirint create mode 100644 infra/debian/circle-interpreter/source/format create mode 100644 infra/debian/circle-interpreter/source/lintian-overrides diff --git a/infra/debian/circle-interpreter/changelog b/infra/debian/circle-interpreter/changelog index 339e0b81d64..daaa6b7159c 100644 --- a/infra/debian/circle-interpreter/changelog +++ b/infra/debian/circle-interpreter/changelog @@ -1,5 +1,5 @@ -circle-interpreter (1.30.0) jammy; urgency=low +circle-interpreter (1.30.0) focal; urgency=low * First circle-interpreter Debian package release for developers. - -- Saehie Park Mon, 23 Apr 2025 10:10:00 +0900 + -- SeunghoPark Thu, 24 Apr 2025 16:07:00 +0900 diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index eb6da70d989..241c7f55b07 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -1,13 +1,13 @@ # {FILES_TO_INSTALL} {DEST_DIR} # bin -usr/bin/circle-interpreter usr/share/cirint/bin/ +bin/circle-interpreter usr/share/cirint/bin/ # lib -usr/lib/libloco.so usr/share/cirint/bin/ -usr/lib/libluci_env.so usr/share/cirint/bin/ -usr/lib/libluci_import.so usr/share/cirint/bin/ -usr/lib/libluci_interpreter.so usr/share/cirint/bin/ -usr/lib/libluci_lang.so usr/share/cirint/bin/ -usr/lib/libluci_logex.so usr/share/cirint/bin/ -usr/lib/libluci_log.so usr/share/cirint/bin/ -usr/lib/libluci_plan.so usr/share/cirint/bin/ -usr/lib/libluci_profile.so usr/share/cirint/bin/ +lib/libloco.so usr/share/cirint/bin/ +lib/libluci_env.so usr/share/cirint/bin/ +lib/libluci_import.so usr/share/cirint/bin/ +lib/libluci_interpreter.so usr/share/cirint/bin/ +lib/libluci_lang.so usr/share/cirint/bin/ +lib/libluci_logex.so usr/share/cirint/bin/ +lib/libluci_log.so usr/share/cirint/bin/ +lib/libluci_plan.so usr/share/cirint/bin/ +lib/libluci_profile.so usr/share/cirint/bin/ diff --git a/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides b/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides new file mode 100644 index 00000000000..0573de0ab0a --- /dev/null +++ b/infra/debian/circle-interpreter/circle-interpreter.lintian-overrides @@ -0,0 +1 @@ +circle-interpreter: binary-without-manpage diff --git a/infra/debian/circle-interpreter/compat b/infra/debian/circle-interpreter/compat index ec635144f60..48082f72f08 100644 --- a/infra/debian/circle-interpreter/compat +++ b/infra/debian/circle-interpreter/compat @@ -1 +1 @@ -9 +12 diff --git a/infra/debian/circle-interpreter/control b/infra/debian/circle-interpreter/control index 4e0392552aa..d058c7ce3f0 100644 --- a/infra/debian/circle-interpreter/control +++ b/infra/debian/circle-interpreter/control @@ -1,11 +1,15 @@ Source: circle-interpreter Section: devel Priority: optional -Build-Depends: devscripts, debhelper, cmake +Build-Depends: debhelper (>= 12), cmake Maintainer: Neural Network Acceleration Solution Developers +Standards-Version: 4.5.0 +Homepage: https://github.com/Samsung/ONE Package: circle-interpreter -Homepage: https://github.com/Samsung/ONE -Standards-Version: 3.9.8 Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Interpreter for circle model + Circle is a lightweight neural network model format developed in the ONE project. + This package provides the 'circle-interpreter' tool, which runs inference on + Circle models for validation and testing purposes. diff --git a/infra/debian/circle-interpreter/copyright b/infra/debian/circle-interpreter/copyright index a792fe45aab..1717bb3da3f 100644 --- a/infra/debian/circle-interpreter/copyright +++ b/infra/debian/circle-interpreter/copyright @@ -1,3 +1,14 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: circle-interpreter +Source: https://github.com/Samsung/ONE +Comment: These binaries are built from the ONE project. + Files: * -License: Proprietary -Copyright (c) <2025> +Copyright: 2025 Samsung Electronics., Ltd. +License: Apache-2.0 + This package is licensed under the Apache License, Version 2.0. + . + On Debian systems, the full text of the Apache License Version 2.0 + can be found in: + /usr/share/common-licenses/Apache-2.0 + diff --git a/infra/debian/circle-interpreter/make-cirint b/infra/debian/circle-interpreter/make-cirint new file mode 100755 index 00000000000..0221602dc83 --- /dev/null +++ b/infra/debian/circle-interpreter/make-cirint @@ -0,0 +1,36 @@ +#!/usr/bin/make -f + +CURRENT_DIR=$(shell pwd) +export NNCC_WORKSPACE=build/debian +export NNCC_INSTALL_PREFIX=${CURRENT_DIR}/${NNCC_WORKSPACE}.install + +%: + dh $@ + +debian-clean: + rm -rf build + +debian-configure: + CIRCLEINT_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};oops;loco;logo-core;logo;locop" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};hermes;hermes-std;safemain;mio-circle08" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};luci-compute;luci;luci-interpreter" + CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};foder;arser;vconone;circle-interpreter" + + ./nncc configure \ + -DENABLE_STRICT_BUILD=ON \ + -DENABLE_TEST=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DEXTERNALS_BUILD_THREADS=4 \ + -DCMAKE_INSTALL_PREFIX=${NNCC_INSTALL_PREFIX} \ + -DBUILD_WHITELIST="${CIRCLEINT_ITEMS}" + +debian-build: + ./nncc build -j16 + +debian-test: + # skip test + +debian-install: + ./nncc install + diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 91e39d0bd6d..2c6df8bb1c4 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,40 +1,49 @@ #!/usr/bin/make -f -export NNCC_WORKSPACE=build/debian -export NNCC_INSTALL_PREFIX=$(CURDIR)/debian/tmp/usr/ +export NNCC_INSTALL_PREFIX=$(CURDIR)/build/debian.install +export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: dh $@ override_dh_auto_clean: - # skip clean + # Nothing to clean + true override_dh_auto_configure: - CIRCLEINT_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};oops;loco;logo-core;logo;locop" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};hermes;hermes-std;safemain;mio-circle08" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};luci-compute;luci;luci-interpreter" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};foder;arser;vconone;circle-interpreter" - - ./nncc configure \ - -DENABLE_STRICT_BUILD=ON \ - -DENABLE_TEST=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DEXTERNALS_BUILD_THREADS=4 \ - -DCMAKE_INSTALL_PREFIX=${NNCC_INSTALL_PREFIX} \ - -DBUILD_WHITELIST="${CIRCLEINT_ITEMS}" + # No configure step needed + true override_dh_auto_build: - ./nncc build -j4 + # No build step needed + true override_dh_auto_test: - # skip test + # No test step needed + true override_dh_auto_install: - cmake --build ${NNCC_WORKSPACE} -- install + # copy the bin file + mkdir -p ${DEBIAN_PREFIX}/bin + cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ + + # copy the lib files + mkdir -p ${DEBIAN_PREFIX}/lib + cp ${NNCC_INSTALL_PREFIX}/lib/libloco.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ${DEBIAN_PREFIX}/lib/ + cp ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ${DEBIAN_PREFIX}/lib/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info +override_dh_strip: + dh_strip --no-automatic-dbgsym + override_dh_builddeb: - dh_builddeb -- -Zgzip + dh_builddeb diff --git a/infra/debian/circle-interpreter/source/format b/infra/debian/circle-interpreter/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/infra/debian/circle-interpreter/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/infra/debian/circle-interpreter/source/lintian-overrides b/infra/debian/circle-interpreter/source/lintian-overrides new file mode 100644 index 00000000000..2fabb7a90d8 --- /dev/null +++ b/infra/debian/circle-interpreter/source/lintian-overrides @@ -0,0 +1,26 @@ +circle-interpreter source: source-is-missing build/debian.install/bin/circle-eval-diff +circle-interpreter source: source-is-missing build/debian.install/bin/circle-interpreter +circle-interpreter source: source-is-missing build/debian.install/bin/circle-mpqsolver +circle-interpreter source: source-is-missing build/debian.install/bin/circle-operator +circle-interpreter source: source-is-missing build/debian.install/bin/circle-opselector +circle-interpreter source: source-is-missing build/debian.install/bin/circle-partitioner +circle-interpreter source: source-is-missing build/debian.install/bin/circle-quantizer +circle-interpreter source: source-is-missing build/debian.install/bin/circle-resizer +circle-interpreter source: source-is-missing build/debian.install/bin/circle-tensordump +circle-interpreter source: source-is-missing build/debian.install/bin/circle2circle +circle-interpreter source: source-is-missing build/debian.install/bin/circle_execution_plan +circle-interpreter source: source-is-missing build/debian.install/bin/circle_input_names +circle-interpreter source: source-is-missing build/debian.install/bin/circle_part_driver +circle-interpreter source: source-is-missing build/debian.install/bin/circledump +circle-interpreter source: source-is-missing build/debian.install/bin/dalgona +circle-interpreter source: source-is-missing build/debian.install/bin/fme-apply +circle-interpreter source: source-is-missing build/debian.install/bin/fme-detect +circle-interpreter source: source-is-missing build/debian.install/bin/luci_eval_driver +circle-interpreter source: source-is-missing build/debian.install/bin/one-version +circle-interpreter source: source-is-missing build/debian.install/bin/q-implant +circle-interpreter source: source-is-missing build/debian.install/bin/record-minmax +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-file +circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-reverse +circle-interpreter source: source-is-missing build/debian.install/bin/tflite2circle + From 65ce166f6fd938327629767070906ae56b0a3d6d Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:36:56 +0900 Subject: [PATCH 054/139] Use the quilt method for packaging ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/debian/circle-interpreter/source/format b/infra/debian/circle-interpreter/source/format index 89ae9db8f88..163aaf8d82b 100644 --- a/infra/debian/circle-interpreter/source/format +++ b/infra/debian/circle-interpreter/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) From f3102f6bd45a0ede25864b7ad2674e63bd12b9ce Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:54:47 +0900 Subject: [PATCH 055/139] Revise the rules to copy .so files directly from original source ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/rules | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 2c6df8bb1c4..50b482b4942 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -26,18 +26,6 @@ override_dh_auto_install: # copy the bin file mkdir -p ${DEBIAN_PREFIX}/bin cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ - - # copy the lib files - mkdir -p ${DEBIAN_PREFIX}/lib - cp ${NNCC_INSTALL_PREFIX}/lib/libloco.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ${DEBIAN_PREFIX}/lib/ - cp ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ${DEBIAN_PREFIX}/lib/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info From 3ea2f806d623e806f58d38fc296c31127ea5b1dd Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:58:19 +0900 Subject: [PATCH 056/139] Revise the rules to copy .so files directly from original source ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../circle-interpreter.install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index 241c7f55b07..c42f00e895e 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -2,12 +2,12 @@ # bin bin/circle-interpreter usr/share/cirint/bin/ # lib -lib/libloco.so usr/share/cirint/bin/ -lib/libluci_env.so usr/share/cirint/bin/ -lib/libluci_import.so usr/share/cirint/bin/ -lib/libluci_interpreter.so usr/share/cirint/bin/ -lib/libluci_lang.so usr/share/cirint/bin/ -lib/libluci_logex.so usr/share/cirint/bin/ -lib/libluci_log.so usr/share/cirint/bin/ -lib/libluci_plan.so usr/share/cirint/bin/ -lib/libluci_profile.so usr/share/cirint/bin/ +build/debian.install/lib/libloco.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_env.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_import.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_interpreter.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_lang.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_logex.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_log.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_plan.so usr/share/cirint/bin/ +build/debian.install/lib/libluci_profile.so usr/share/cirint/bin/ From 75afb0191bb66d3b08e5bb535d131a94e3a0226c Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 10:58:32 +0900 Subject: [PATCH 057/139] Update the changelog ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/infra/debian/circle-interpreter/changelog b/infra/debian/circle-interpreter/changelog index daaa6b7159c..c06c28a8db0 100644 --- a/infra/debian/circle-interpreter/changelog +++ b/infra/debian/circle-interpreter/changelog @@ -1,3 +1,9 @@ +circle-interpreter (1.30.0~20250424.2227) focal; urgency=medium + + * Daily build with timestamp. + + -- SeunghoPark Thu, 24 Apr 2025 22:27:41 +0900 + circle-interpreter (1.30.0) focal; urgency=low * First circle-interpreter Debian package release for developers. From 24c6a93a816522f1e10052782e2d0eab9860c3cf Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 11:49:56 +0900 Subject: [PATCH 058/139] Revise the build-circle-intp.yml workflow to test on private repo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 036f29d94f5..3848cbbc13f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -18,10 +18,11 @@ concurrency: jobs: onecc-test: - if: github.repository_owner == 'Samsung' + if: github.repository_owner == 'Samsung' || github.repository_owner == 'shs-park' strategy: matrix: - ubuntu_code: [ focal, jammy ] + # TODO activate jammy + ubuntu_code: [ focal ] include: - ubuntu_code: focal ubuntu_ver: 2004 @@ -30,13 +31,15 @@ jobs: - ubuntu_code: jammy ubuntu_ver: 2204 comment_id: 2658268060 - runs-on: ubuntu-latest + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: - NNCC_WORKSPACE : build - NNCC_INSTALL_PREFIX : install + NNCC_WORKSPACE : build/debian + NNCC_INSTALL_PREFIX : ${{ github.workspace }}/debian/tmp/usr/ name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: @@ -87,8 +90,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: circle_intp_${{ matrix.ubuntu_ver }} - # TODO enable retention-days, default is 90 - # retention-days: 3 + retention-days: 3 path: | ${{ env.NNCC_WORKSPACE }}/cirintp/ @@ -98,6 +100,7 @@ jobs: - name: Update URL if: false run: | + exit(1) # TODO enable posting comments echo "Artifact URL is ${{ steps.step-upload.outputs.artifact-url }}" COMMENT_ADDR=https://api.github.com/repos/Samsung/ONE/issues/comments/${{ matrix.comment_id }} curl -L \ From d10ab5fa4ab1d41bff4a964705dfa32170fc357e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:36:04 +0900 Subject: [PATCH 059/139] Fix the path ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3848cbbc13f..9ba8cc2cbc4 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -74,16 +74,16 @@ jobs: run: | cd ${NNCC_WORKSPACE} mkdir -p cirintp - cp -v ./${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. - cp -v ./${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. - name: Upload Artifact id: step-upload From 8952b524c0f1b76cf7ead61e8cd1be6a1dc17a2b Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:50:02 +0900 Subject: [PATCH 060/139] Use only focal in the matrix ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9ba8cc2cbc4..172da05869e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -22,15 +22,14 @@ jobs: strategy: matrix: # TODO activate jammy - ubuntu_code: [ focal ] include: - ubuntu_code: focal ubuntu_ver: 2004 # TODO update comment ID, these are experimental IDs of issue #14669 comment_id: 2658267907 - - ubuntu_code: jammy - ubuntu_ver: 2204 - comment_id: 2658268060 + # - ubuntu_code: jammy + # ubuntu_ver: 2204 + # comment_id: 2658268060 # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] From 3377688d9d47746649bf1b4f9df20ee849f76381 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 14:52:53 +0900 Subject: [PATCH 061/139] Add a comment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 172da05869e..a1385439cb3 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -84,6 +84,7 @@ jobs: cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + # Doesn't actually need this step - name: Upload Artifact id: step-upload uses: actions/upload-artifact@v4 From fabf9100056fbecdfcdcfd0e9429058e1507fdb9 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 25 Apr 2025 15:27:15 +0900 Subject: [PATCH 062/139] Revise the path of each targets ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 36 +++++++++++-------- .../circle-interpreter.install | 18 +++++----- infra/debian/circle-interpreter/rules | 2 +- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index a1385439cb3..865cb2d5dc3 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -37,8 +37,10 @@ jobs: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: - NNCC_WORKSPACE : build/debian - NNCC_INSTALL_PREFIX : ${{ github.workspace }}/debian/tmp/usr/ + NNCC_BUILD: build + NNCC_WORKSPACE: build/debian + NNCC_INSTALL_PREFIX: ${{ github.workspace }}/debian.install + CIRINTP_PREFIX: cirintp name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: @@ -72,17 +74,17 @@ jobs: - name: Gather files run: | cd ${NNCC_WORKSPACE} - mkdir -p cirintp - cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./cirintp/. - cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./cirintp/. + mkdir -p ${CIRINTP_PREFIX} + cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_env.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_import.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_interpreter.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_lang.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_logex.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_log.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./${CIRINTP_PREFIX}/. + cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./${CIRINTP_PREFIX}/. # Doesn't actually need this step - name: Upload Artifact @@ -92,7 +94,13 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_WORKSPACE }}/cirintp/ + ${{ env.NNCC_WORKSPACE }}/${CIRINTP_PREFIX}/ + + - name: Create debian package + run: | + cd ${{ env.NNCC_BUILD }} + cp -rf infra/debian/circlr-interpreter ./debian + la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index c42f00e895e..3e97ee7f198 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -2,12 +2,12 @@ # bin bin/circle-interpreter usr/share/cirint/bin/ # lib -build/debian.install/lib/libloco.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_env.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_import.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_interpreter.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_lang.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_logex.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_log.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_plan.so usr/share/cirint/bin/ -build/debian.install/lib/libluci_profile.so usr/share/cirint/bin/ +libloco.so usr/share/cirint/bin/ +libluci_env.so usr/share/cirint/bin/ +libluci_import.so usr/share/cirint/bin/ +libluci_interpreter.so usr/share/cirint/bin/ +libluci_lang.so usr/share/cirint/bin/ +libluci_logex.so usr/share/cirint/bin/ +libluci_log.so usr/share/cirint/bin/ +libluci_plan.so usr/share/cirint/bin/ +libluci_profile.so usr/share/cirint/bin/ diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 50b482b4942..004439a8eda 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export NNCC_INSTALL_PREFIX=$(CURDIR)/build/debian.install +export NNCC_INSTALL_PREFIX=$(CURDIR)/debian.install export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: From a7bdaaea17080e67c783d0777acf5e35833dabe1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 09:26:25 +0900 Subject: [PATCH 063/139] Add inputs to the workflow. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 865cb2d5dc3..5ce8c1c2230 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -6,6 +6,14 @@ on: # # 05:00 AM (KST, UTC+9:00) Mon-Fri # - cron: '00 20 * * 0-4' workflow_dispatch: + inputs: + cirint_version: + description: 'The version of circle-interpreter' + required: true + default: '1.30.0' + cirint_description: + description: 'Description of changelog for circle-interpreter' + required: true defaults: run: From 58749e95fd2a161cd3a12e1cd85618959feb8fa2 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 13:20:15 +0900 Subject: [PATCH 064/139] Fix a typo.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 5ce8c1c2230..8028d59566a 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,7 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} - cp -rf infra/debian/circlr-interpreter ./debian + cp -rf infra/debian/circle-interpreter ./debian la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 43738a2f824e9ab0b89015123e23068a09ca483e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:14:01 +0900 Subject: [PATCH 065/139] Fix the path of build directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8028d59566a..613fc73ff64 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,7 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} - cp -rf infra/debian/circle-interpreter ./debian + cp -rf ../infra/debian/circle-interpreter ./debian la -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From e899296d00f5a925844bee41adb9d6e08b6a3de1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:15:09 +0900 Subject: [PATCH 066/139] chmod -x make-cirint ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/make-cirint | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 infra/debian/circle-interpreter/make-cirint diff --git a/infra/debian/circle-interpreter/make-cirint b/infra/debian/circle-interpreter/make-cirint old mode 100755 new mode 100644 From ddb119455088bed0447ee97d7fd9928b982e1ece Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:31:53 +0900 Subject: [PATCH 067/139] Fix path and typo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 613fc73ff64..d76fcb19456 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -81,7 +81,7 @@ jobs: - name: Gather files run: | - cd ${NNCC_WORKSPACE} + cd ${NNCC_BUILD} mkdir -p ${CIRINTP_PREFIX} cp -v ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ./${CIRINTP_PREFIX}/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libloco.so ./${CIRINTP_PREFIX}/. @@ -102,13 +102,13 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_WORKSPACE }}/${CIRINTP_PREFIX}/ + ${{ env.NNCC_BUILD }}/${CIRINTP_PREFIX}/ - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} cp -rf ../infra/debian/circle-interpreter ./debian - la -alh # TODO remove this + ls -alh # TODO remove this # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From 2612f8dc7ba588b15d60e7e64f1e17ca34db68a8 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 14:54:49 +0900 Subject: [PATCH 068/139] Add some release related work ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d76fcb19456..ca8ba951a47 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -102,13 +102,21 @@ jobs: name: circle_intp_${{ matrix.ubuntu_ver }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/${CIRINTP_PREFIX}/ + ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - name: Create debian package run: | cd ${{ env.NNCC_BUILD }} cp -rf ../infra/debian/circle-interpreter ./debian ls -alh # TODO remove this + release_date=$(date +%Y%m%d) + version=${{ inputs.cirint_version }}~${release_date} + tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + dch -v "${version}" "${{ inputs.cirint_description }}" -b + cat debian/changelog # TODO remove this + debuild -S -sa + ls -alh # TODO remove this + # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From d214b416ad823253ad1430dc9df232998df12a95 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 15:36:57 +0900 Subject: [PATCH 069/139] Revise build directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ca8ba951a47..d4295a53619 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -46,8 +46,8 @@ jobs: options: --user root env: NNCC_BUILD: build - NNCC_WORKSPACE: build/debian - NNCC_INSTALL_PREFIX: ${{ github.workspace }}/debian.install + NNCC_WORKSPACE: build/release + NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} From de328af45f2c78e983d4c099235ba2c1c38abaff Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 17:56:20 +0900 Subject: [PATCH 070/139] Reorder some debian related commands ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d4295a53619..ff758c4bf94 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -106,16 +106,22 @@ jobs: - name: Create debian package run: | - cd ${{ env.NNCC_BUILD }} - cp -rf ../infra/debian/circle-interpreter ./debian + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} - tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this + + cd ${{ env.NNCC_BUILD }} + tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} debuild -S -sa ls -alh # TODO remove this + cd ${{ env.NNCC_BUILD }} # TODO remove this + ls -alh # TODO remove this # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 6d19fc13abb78473ab6f4ba7d22eed48143e872e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 18:53:56 +0900 Subject: [PATCH 071/139] Add some debug code ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ff758c4bf94..b5755bdaaf2 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,6 +107,8 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + pwd # TODO remove this + ls -alh # TODO remove this cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) From ae5d2384022634eb4be53bded1cc9172bf91ad75 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:03:05 +0900 Subject: [PATCH 072/139] Fix the path access ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index b5755bdaaf2..3b188fdede1 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -107,9 +107,7 @@ jobs: - name: Create debian package run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} - pwd # TODO remove this - ls -alh # TODO remove this - cp -rf ${{ github.workspace }}/infra/debian/circle-interpreter ./debian + cp -rf ../../infra/debian/circle-interpreter ./debian ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} From 9a152f678d3247a448b20ae8fafcdf060fd19328 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:28:08 +0900 Subject: [PATCH 073/139] Fix Path ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3b188fdede1..f6b113225d5 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -114,13 +114,13 @@ jobs: dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this - cd ${{ env.NNCC_BUILD }} + cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} - cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa ls -alh # TODO remove this - cd ${{ env.NNCC_BUILD }} # TODO remove this + cd ../ # TODO remove this ls -alh # TODO remove this # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes From f861527f92c66a4cefcd0e3fb5cfbb1540cd7bd3 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 19:58:48 +0900 Subject: [PATCH 074/139] Add author and email for the dch command ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f6b113225d5..48aaa26703c 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -14,6 +14,14 @@ on: cirint_description: description: 'Description of changelog for circle-interpreter' required: true + deb_fullname: + description: 'Full name of Debian package author' + required: false + default: 'On-device AI developers' + deb_email: + description: 'Email address of Debian package author' + required: false + default: 'nnfw@samsung.com' defaults: run: @@ -108,9 +116,10 @@ jobs: run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian - ls -alh # TODO remove this release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} + export DEBFULLNAME="${{ inputs.deb_fullname }}" + export DEBEMAIL="${{ inputs.deb_email }}" dch -v "${version}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this @@ -119,9 +128,7 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa - ls -alh # TODO remove this - cd ../ # TODO remove this - ls -alh # TODO remove this + # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From 159d587fdef871ac9188973b0adac23ad8446376 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 20:34:06 +0900 Subject: [PATCH 075/139] Use secret key ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 48aaa26703c..9c202582144 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -120,7 +120,7 @@ jobs: version=${{ inputs.cirint_version }}~${release_date} export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${version}" "${{ inputs.cirint_description }}" -b + dch -v "${version}" --distribution "${{ matrix.ubuntu_code }}" "${{ inputs.cirint_description }}" -b cat debian/changelog # TODO remove this cd ../ @@ -129,6 +129,12 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa + cd ../ + ls -alh # TODO remove this + mkdir -p ~/.ssh + echo "${{ secrets.LAUNCHPAD_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment From d4b780a3274212d174b25ec3aee330a6295a39e8 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 28 Apr 2025 20:50:06 +0900 Subject: [PATCH 076/139] Add private keys ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9c202582144..35fadef3075 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -126,13 +126,17 @@ jobs: cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + mkdir -p ~/.gnupg + chmod 700 ~/.gnupg + echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import + gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa cd ../ ls -alh # TODO remove this mkdir -p ~/.ssh - echo "${{ secrets.LAUNCHPAD_PRIVATE_KEY }}" > ~/.ssh/id_rsa + echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes From a10774023e49f7ec623aa8f8372f80e6f950d4bf Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 10:49:07 +0900 Subject: [PATCH 077/139] Add debug log ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 35fadef3075..dffc6d58e12 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -114,6 +114,7 @@ jobs: - name: Create debian package run: | + echo "Update changelog" cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian release_date=$(date +%Y%m%d) @@ -126,6 +127,7 @@ jobs: cd ../ tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + echo "debuild: signing with the gpg key" mkdir -p ~/.gnupg chmod 700 ~/.gnupg echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import @@ -133,6 +135,7 @@ jobs: cd ${{ env.CIRINTP_PREFIX }} debuild -S -sa + echo "Upload to Launchpad" cd ../ ls -alh # TODO remove this mkdir -p ~/.ssh From efc54f44fde05ef611fa8999690ba46d9ae90f14 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 14:24:46 +0900 Subject: [PATCH 078/139] revise the usage of debuild ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index dffc6d58e12..1985040919e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -133,7 +133,11 @@ jobs: echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - debuild -S -sa + GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + DEBSIGN_PROGRAM=gpg \ + DEBSIGN_KEYID=${GPG_KEY_ID} \ + GPG_TTY=$(tty) \ + debuild -S -sa echo "Upload to Launchpad" cd ../ From 25af7cdececcd978078d9110f9f76f1ef026228e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 14:45:21 +0900 Subject: [PATCH 079/139] Revise debuild envrironment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 1985040919e..4c3088194ed 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -134,10 +134,16 @@ jobs: gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + echo "$GPG_KEY_ID:6:" | gpg --import-ownertrust + echo "use-agent" >> ~/.gnupg/gpg.conf + echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + export DEBSIGN_KEYID=${GPG_KEY_ID} + export GPG_TTY=$(tty) + gpgconf --kill gpg-agent + gpgconf --launch gpg-agent DEBSIGN_PROGRAM=gpg \ - DEBSIGN_KEYID=${GPG_KEY_ID} \ - GPG_TTY=$(tty) \ - debuild -S -sa + debuild -S -sa --no-lintian --sign-key=$GPG_KEY_ID echo "Upload to Launchpad" cd ../ From 4f804719b2ded68e586fb55faa51310692127252 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:05:16 +0900 Subject: [PATCH 080/139] Revise the debuild environment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 4c3088194ed..8ad29d96fc5 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -134,7 +134,9 @@ jobs: gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - echo "$GPG_KEY_ID:6:" | gpg --import-ownertrust + # get fingerprint + FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') + echo "$FPR:6:" | gpg --import-ownertrust echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf @@ -143,7 +145,7 @@ jobs: gpgconf --kill gpg-agent gpgconf --launch gpg-agent DEBSIGN_PROGRAM=gpg \ - debuild -S -sa --no-lintian --sign-key=$GPG_KEY_ID + debuild -S -sa --sign-key=$GPG_KEY_ID echo "Upload to Launchpad" cd ../ From 417472918d57aa3a58a54f78f873ddfa83ed59f9 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:12:48 +0900 Subject: [PATCH 081/139] reorder some lines ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8ad29d96fc5..f0e621a5270 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -133,13 +133,13 @@ jobs: echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${GPG_KEY_ID} export GPG_TTY=$(tty) gpgconf --kill gpg-agent From cbd6c1f303b5fc6bdea6135234e2a05cd84e6506 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 15:19:55 +0900 Subject: [PATCH 082/139] Revise debuild env.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f0e621a5270..3a252d71fb9 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -128,24 +128,28 @@ jobs: tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} echo "debuild: signing with the gpg key" - mkdir -p ~/.gnupg - chmod 700 ~/.gnupg + echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} + # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust + + mkdir -p ~/.gnupg + chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - export DEBSIGN_KEYID=${GPG_KEY_ID} - export GPG_TTY=$(tty) gpgconf --kill gpg-agent gpgconf --launch gpg-agent - DEBSIGN_PROGRAM=gpg \ - debuild -S -sa --sign-key=$GPG_KEY_ID + + #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + export DEBSIGN_KEYID=${FPR} + export GPG_TTY="" + export DEBSIGN_PROGRAM=gpg + debuild -S -sa --sign-key=${FPR} echo "Upload to Launchpad" cd ../ From ecf91974d558323c077541587069520c3acd11ff Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 18:22:17 +0900 Subject: [PATCH 083/139] Add no-tty option to the gpg.conf ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3a252d71fb9..9ae412dc8f0 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,6 +141,7 @@ jobs: chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + echo "no-tty" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From 7a6264c04dc6e6c7f0f6a7e9aadc9c94ea9585ce Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 18:52:00 +0900 Subject: [PATCH 084/139] Revise to use GPG_AGENT_INFO=1 ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 9ae412dc8f0..fc2d5a81f1f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -149,6 +149,7 @@ jobs: #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${FPR} export GPG_TTY="" + export GPG_AGENT_INFO=1 export DEBSIGN_PROGRAM=gpg debuild -S -sa --sign-key=${FPR} From 36fe348b2d939f0170676f41c2d458d2fdf63681 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:02:03 +0900 Subject: [PATCH 085/139] Retry ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index fc2d5a81f1f..ce4b2ad621c 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,14 +141,14 @@ jobs: chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - echo "no-tty" >> ~/.gnupg/gpg.conf + # echo "no-tty" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') export DEBSIGN_KEYID=${FPR} - export GPG_TTY="" + #export GPG_TTY="" export GPG_AGENT_INFO=1 export DEBSIGN_PROGRAM=gpg debuild -S -sa --sign-key=${FPR} From 1fd12f2e6f07f7d49c673d207dbdccd67b545892 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:12:26 +0900 Subject: [PATCH 086/139] add batch option ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index ce4b2ad621c..1eb1ad12720 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -142,6 +142,7 @@ jobs: echo "use-agent" >> ~/.gnupg/gpg.conf echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf # echo "no-tty" >> ~/.gnupg/gpg.conf + echo "batch" >> ~/.gnupg/gpg.conf echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From 1c1300936196305762fe0bea1dcccf336368c2ce Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 19:24:34 +0900 Subject: [PATCH 087/139] retry.. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 1eb1ad12720..d90f20f567b 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -140,10 +140,11 @@ jobs: mkdir -p ~/.gnupg chmod 700 ~/.gnupg echo "use-agent" >> ~/.gnupg/gpg.conf - echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - # echo "no-tty" >> ~/.gnupg/gpg.conf + #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf + #echo "no-tty" >> ~/.gnupg/gpg.conf echo "batch" >> ~/.gnupg/gpg.conf - echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf gpgconf --kill gpg-agent gpgconf --launch gpg-agent From 6a47cdff668a419ae4b96d61127786f24a5bf37f Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:14:16 +0900 Subject: [PATCH 088/139] retry with debsign ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 40 ++++++++++++++----------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index d90f20f567b..a79a888ede2 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,7 +129,8 @@ jobs: echo "debuild: signing with the gpg key" - echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --batch --import + #echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --import + echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} @@ -137,23 +138,26 @@ jobs: FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - mkdir -p ~/.gnupg - chmod 700 ~/.gnupg - echo "use-agent" >> ~/.gnupg/gpg.conf - #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf - #echo "no-tty" >> ~/.gnupg/gpg.conf - echo "batch" >> ~/.gnupg/gpg.conf - #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - gpgconf --kill gpg-agent - gpgconf --launch gpg-agent - - #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - export DEBSIGN_KEYID=${FPR} - #export GPG_TTY="" - export GPG_AGENT_INFO=1 - export DEBSIGN_PROGRAM=gpg - debuild -S -sa --sign-key=${FPR} + debuild -S -us -uc + debsign -k${FPR} ../circle-interpreter_*.changes + + # mkdir -p ~/.gnupg + # chmod 700 ~/.gnupg + # echo "use-agent" >> ~/.gnupg/gpg.conf + # #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf + # #echo "no-tty" >> ~/.gnupg/gpg.conf + # echo "batch" >> ~/.gnupg/gpg.conf + # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + # gpgconf --kill gpg-agent + # gpgconf --launch gpg-agent + + # #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') + # export DEBSIGN_KEYID=${FPR} + # #export GPG_TTY="" + # export GPG_AGENT_INFO=1 + # export DEBSIGN_PROGRAM=gpg + # debuild -S -sa --sign-key=${FPR} echo "Upload to Launchpad" cd ../ From 1fac071b1b449d449e1b36608fe2e8dc3220aaf2 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:23:33 +0900 Subject: [PATCH 089/139] Remove error generating line ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index a79a888ede2..4e3927a7249 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,7 +129,6 @@ jobs: echo "debuild: signing with the gpg key" - #echo "${{ secrets.GPG_NNFW_PRIVATE_KEY }}" | gpg --import echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} From 1486936fc9e0330ac86a80866f7963978a396394 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:42:56 +0900 Subject: [PATCH 090/139] Add debug log ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 4e3927a7249..fc2f99e06bd 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -137,7 +137,13 @@ jobs: FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust + echo "Reading.. gpg.conf" + cat ~/.gnupg/gpg.conf + + echo "Running.. debuild -S -us -uc" debuild -S -us -uc + + echo "Running.. debsign -k${FPR} ../circle-interpreter_*.changes" debsign -k${FPR} ../circle-interpreter_*.changes # mkdir -p ~/.gnupg From 201def773f0768a67d4b6307d57f0e613ae04680 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 20:59:29 +0900 Subject: [PATCH 091/139] Clean .gnupg directory ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index fc2f99e06bd..92ab44d4117 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -129,6 +129,9 @@ jobs: echo "debuild: signing with the gpg key" + echo "Remove.. gpg.conf" + rm -rf ~/.gnupg + echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} From 1d5cca51b0ae7edb245bea45924eff96e38ca3d0 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:25:31 +0900 Subject: [PATCH 092/139] pass the cat error ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 92ab44d4117..6bf238e1761 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,7 +141,7 @@ jobs: echo "$FPR:6:" | gpg --import-ownertrust echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf + cat ~/.gnupg/gpg.conf | true echo "Running.. debuild -S -us -uc" debuild -S -us -uc From 7f45bf0972bff302f5ce5fd429ea514530245324 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:34:22 +0900 Subject: [PATCH 093/139] Fix error; ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 6bf238e1761..783dfe22ef9 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,7 +141,7 @@ jobs: echo "$FPR:6:" | gpg --import-ownertrust echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf | true + cat ~/.gnupg/gpg.conf || true echo "Running.. debuild -S -us -uc" debuild -S -us -uc From a9f5fa26f3acce1d81e088cc16513d851421ac96 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 21:52:47 +0900 Subject: [PATCH 094/139] debsign ok. upload artifacts ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 40 +++++++------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 783dfe22ef9..0862685ad8e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -113,6 +113,7 @@ jobs: ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - name: Create debian package + id: create-debian-package run: | echo "Update changelog" cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} @@ -128,45 +129,15 @@ jobs: tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} echo "debuild: signing with the gpg key" - - echo "Remove.. gpg.conf" rm -rf ~/.gnupg - echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import - gpg --list-secret-keys # TODO remove this cd ${{ env.CIRINTP_PREFIX }} - # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - - echo "Reading.. gpg.conf" - cat ~/.gnupg/gpg.conf || true - - echo "Running.. debuild -S -us -uc" debuild -S -us -uc - - echo "Running.. debsign -k${FPR} ../circle-interpreter_*.changes" debsign -k${FPR} ../circle-interpreter_*.changes - # mkdir -p ~/.gnupg - # chmod 700 ~/.gnupg - # echo "use-agent" >> ~/.gnupg/gpg.conf - # #echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf - # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg.conf - # #echo "no-tty" >> ~/.gnupg/gpg.conf - # echo "batch" >> ~/.gnupg/gpg.conf - # #echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf - # gpgconf --kill gpg-agent - # gpgconf --launch gpg-agent - - # #GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -n1 | awk -F'/' '{print $2}' | awk '{print $1}') - # export DEBSIGN_KEYID=${FPR} - # #export GPG_TTY="" - # export GPG_AGENT_INFO=1 - # export DEBSIGN_PROGRAM=gpg - # debuild -S -sa --sign-key=${FPR} - echo "Upload to Launchpad" cd ../ ls -alh # TODO remove this @@ -176,6 +147,15 @@ jobs: cat ~/.ssh/id_rsa # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes + - name: Upload Artifact + id: upload-debian-package + uses: actions/upload-artifact@v4 + with: + name: circle-interpreter_${{ steps.create-debian-package.outputs.version }} + retention-days: 3 + path: | + ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.create-debian-package.outputs.version }}.orig.tar.xz + # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official # TODO enable update URL when key is available From 65bb22f208839714023ba4e508558a8a26fc6de0 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 22:33:36 +0900 Subject: [PATCH 095/139] Revise current implementation ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 56 +++++++++++++++---------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 0862685ad8e..8d645332a31 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -66,7 +66,7 @@ jobs: - name: Install required packages run: | apt-get update - apt-get install curl + apt-get install -y curl - name: Build without test run: | @@ -112,49 +112,63 @@ jobs: path: | ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - - name: Create debian package - id: create-debian-package + - name: Config files + id: config run: | - echo "Update changelog" - cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} - cp -rf ../../infra/debian/circle-interpreter ./debian release_date=$(date +%Y%m%d) version=${{ inputs.cirint_version }}~${release_date} + changes_file="circle-interpreter_${version}_source.changes" + tarball_file="circle-interpreter_${version}.orig.tar.xz" + + echo "version=${version}" >> $GITHUB_OUTPUT + echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT + echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + + - name: Update changelog + run: | + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} + cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${version}" --distribution "${{ matrix.ubuntu_code }}" "${{ inputs.cirint_description }}" -b - cat debian/changelog # TODO remove this + dch -v "${{ steps.config.outputs.version }}" \ + --distribution "${{ matrix.ubuntu_code }}" \ + "${{ inputs.cirint_description }}" -b - cd ../ - tar -caf circle-interpreter_${version}.orig.tar.xz ${{ env.CIRINTP_PREFIX }} + - name: Craete original tarball + run: | + cd ${{ env.NNCC_BUILD }} + tar -caf \ + circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz \ + ${{ env.CIRINTP_PREFIX }} - echo "debuild: signing with the gpg key" + - name: Signing with debuild and debsign + run: | + cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} rm -rf ~/.gnupg echo -n "${{ secrets.GPG_NNFW_SIGNING_KEY }}" | base64 --decode | gpg --import - cd ${{ env.CIRINTP_PREFIX }} # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust debuild -S -us -uc debsign -k${FPR} ../circle-interpreter_*.changes - echo "Upload to Launchpad" - cd ../ - ls -alh # TODO remove this + - name: Upload to Launchpad + run: | + cd ${{ env.NNCC_BUILD }} mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - cat ~/.ssh/id_rsa - # dput ppa:circletools/nightly circle-interpreter_${version}_source.changes + # dput ppa:circletools/nightly \ + # circle-interpreter_${{ steps.config.outputs.version }}_source.changes - - name: Upload Artifact - id: upload-debian-package + - name: Upload artifact; circle-interpreter + id: upload uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ steps.create-debian-package.outputs.version }} + name: circle-interpreter_${{ steps.config.outputs.version }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.create-debian-package.outputs.version }}.orig.tar.xz + ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment # TODO update comment id from experiment to official From 4f134c155ebb83b07ea01bbd2e455bb5502df484 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 29 Apr 2025 22:45:31 +0900 Subject: [PATCH 096/139] Enable uploading to the Launchpad ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8d645332a31..44e784972ea 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -158,8 +158,8 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - # dput ppa:circletools/nightly \ - # circle-interpreter_${{ steps.config.outputs.version }}_source.changes + dput ppa:circletools/nightly \ + circle-interpreter_${{ steps.config.outputs.version }}_source.changes - name: Upload artifact; circle-interpreter id: upload From ceaa48570697ea7076e8c2849f9759788531d368 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 09:54:45 +0900 Subject: [PATCH 097/139] Fix path of installing binaries ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/debian/circle-interpreter/rules b/infra/debian/circle-interpreter/rules index 004439a8eda..1183a5fc656 100644 --- a/infra/debian/circle-interpreter/rules +++ b/infra/debian/circle-interpreter/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export NNCC_INSTALL_PREFIX=$(CURDIR)/debian.install +export NNCC_INSTALL_PREFIX=$(CURDIR) export DEBIAN_PREFIX=$(CURDIR)/debian/tmp %: @@ -25,7 +25,7 @@ override_dh_auto_test: override_dh_auto_install: # copy the bin file mkdir -p ${DEBIAN_PREFIX}/bin - cp ${NNCC_INSTALL_PREFIX}/bin/circle-interpreter ${DEBIAN_PREFIX}/bin/ + cp ${NNCC_INSTALL_PREFIX}/circle-interpreter ${DEBIAN_PREFIX}/bin/ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info From 0bcf060b5b21d5116a166292a4ec3d76f659f430 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:42:36 +0900 Subject: [PATCH 098/139] Create the create-pr-on-success job ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 142 ++++++++++++++++-------- 1 file changed, 95 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 44e784972ea..f2b47b9e78f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -33,8 +33,30 @@ concurrency: cancel-in-progress: true jobs: - onecc-test: + prepare: if: github.repository_owner == 'Samsung' || github.repository_owner == 'shs-park' + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] + outputs: + version: ${{ steps.set-version.outputs.version }} + changes_file: ${{ steps.set-version.outputs.changes_file }} + tarball_file: ${{ steps.set-version.outputs.tarball_file }} + steps: + - name: Set version + id: set-version + run: | + release_date=$(date +%Y%m%d%H%M) + version=${{ inputs.cirint_version }}~${release_date} + changes_file="circle-interpreter_${version}_source.changes" + tarball_file="circle-interpreter_${version}.orig.tar.xz" + + echo "version=${version}" >> $GITHUB_OUTPUT + echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT + echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + + debian-release: + needs: prepare strategy: matrix: # TODO activate jammy @@ -46,6 +68,7 @@ jobs: # - ubuntu_code: jammy # ubuntu_ver: 2204 # comment_id: 2658268060 + name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] @@ -53,11 +76,13 @@ jobs: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} options: --user root env: + VERSION: ${{ needs.prepare.outputs.version }} + CHANGE_FILE: ${{ needs.prepare.outputs.changes_file }} + TARBALL_FILE: ${{ needs.prepare.outputs.tarball_file }} NNCC_BUILD: build NNCC_WORKSPACE: build/release NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp - name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} steps: - name: Checkout @@ -102,44 +127,20 @@ jobs: cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_plan.so ./${CIRINTP_PREFIX}/. cp -v ${NNCC_INSTALL_PREFIX}/lib/libluci_profile.so ./${CIRINTP_PREFIX}/. - # Doesn't actually need this step - - name: Upload Artifact - id: step-upload - uses: actions/upload-artifact@v4 - with: - name: circle_intp_${{ matrix.ubuntu_ver }} - retention-days: 3 - path: | - ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}/ - - - name: Config files - id: config - run: | - release_date=$(date +%Y%m%d) - version=${{ inputs.cirint_version }}~${release_date} - changes_file="circle-interpreter_${version}_source.changes" - tarball_file="circle-interpreter_${version}.orig.tar.xz" - - echo "version=${version}" >> $GITHUB_OUTPUT - echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT - echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT - - name: Update changelog run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${{ steps.config.outputs.version }}" \ + dch -v "${{ env.VERSION }}" \ --distribution "${{ matrix.ubuntu_code }}" \ "${{ inputs.cirint_description }}" -b - name: Craete original tarball run: | cd ${{ env.NNCC_BUILD }} - tar -caf \ - circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz \ - ${{ env.CIRINTP_PREFIX }} + tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} - name: Signing with debuild and debsign run: | @@ -158,31 +159,78 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - dput ppa:circletools/nightly \ - circle-interpreter_${{ steps.config.outputs.version }}_source.changes + dput ppa:circletools/nightly ${{ env.CHANGE_FILE }} - name: Upload artifact; circle-interpreter id: upload uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ steps.config.outputs.version }} + name: circle-interpreter_${{ env.VERSION }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/circle-interpreter_${{ steps.config.outputs.version }}.orig.tar.xz + ${{ env.NNCC_BUILD }}/${{ env.TARBALL_FILE }} + + create-pr-on-success: + name: Create changelog update PR on success + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] + needs: [ prepare, debian-release ] + env: + VERSION: ${{ needs.prepare.outputs.version }} + # TODO need to activate the branch condition + # if: ${{ success() && github.ref == 'refs/heads/master' }} + if: ${{ success() }} + permissions: + contents: write + pull-requests: write - # refer https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment - # TODO update comment id from experiment to official - # TODO enable update URL when key is available - - name: Update URL - if: false + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Git + run: | + git config --global user.name "Seungho Henry Park" + git config --global user.email "shs.park@samsung.com" + + - name: Download tarball + uses: actions/download-artifact@v4 + with: + name: circle-interpreter_${{ env.VERSION }} + + - name: Extract changelog + run: | + tar -xaf circle-interpreter_${VERSION}.orig.tar.xz + cp cirintp/debian/changelog \ + infra/debian/circle-interpreter/changelog + + - name: Create PR branch and commit changelog + run: | + BRANCH=auto/update-cirint-changelog-${{ env.VERSION }} + git checkout -b $BRANCH + git add infra/debian/circle-interpreter/changelog + git commit -m "[infra/debian] Update changelog for circle-interpreter" \ + -m "This updates the changelog for circle-interpreter_${{ env.VERSION }}." \ + -m "It is auto-generated PR from github workflow." \ + -m "" \ + -m "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park " + git push origin $BRANCH + + - name: Create PR + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - exit(1) # TODO enable posting comments - echo "Artifact URL is ${{ steps.step-upload.outputs.artifact-url }}" - COMMENT_ADDR=https://api.github.com/repos/Samsung/ONE/issues/comments/${{ matrix.comment_id }} - curl -L \ - -X PATCH \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.COMMENT_UPDATE_KEY }}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - ${COMMENT_ADDR} \ - -d '{"body":"${{ steps.step-upload.outputs.artifact-url }}"}' + gh pr create \ + --title "[infra/debian] Update changelog for circle-interpreter" \ + --body \ + "$(cat < + EOF + )" + --head $BRANCH \ + --base master From 0fbba29b7e59d5a8ee976ebe9fb19600c1a825b3 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:51:52 +0900 Subject: [PATCH 099/139] Release Version - true/false ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index f2b47b9e78f..58ff6073670 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -22,6 +22,12 @@ on: description: 'Email address of Debian package author' required: false default: 'nnfw@samsung.com' + is_release: + description: 'Is this a release version? \ + Set to false to append date-based subversion. \ + (true/false)' + required: false + default: 'false' defaults: run: @@ -46,8 +52,16 @@ jobs: - name: Set version id: set-version run: | - release_date=$(date +%Y%m%d%H%M) - version=${{ inputs.cirint_version }}~${release_date} + base_version="${{ inputs.cirint_version }}" + is_release="${{ inputs.is_release }}" + + if [[ "$is_release" == "true" ]]; then + version="$base_version" + else + release_date=$(date +%Y%m%d%H%M) + version="${base_version}~${release_date}" + fi + changes_file="circle-interpreter_${version}_source.changes" tarball_file="circle-interpreter_${version}.orig.tar.xz" From d1c1215b8714a3a14d3baa07cdb88e5407c748e9 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:56:03 +0900 Subject: [PATCH 100/139] Fix new lines ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 58ff6073670..291177f9848 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -23,8 +23,8 @@ on: required: false default: 'nnfw@samsung.com' is_release: - description: 'Is this a release version? \ - Set to false to append date-based subversion. \ + description: 'Is this a release version? + Set to false to append date-based subversion. (true/false)' required: false default: 'false' From 8f3cd901981f4cb86e314994923e4c35cd25de12 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 14:59:26 +0900 Subject: [PATCH 101/139] Enable jammy distribution ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 291177f9848..8708467a15e 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -77,11 +77,8 @@ jobs: include: - ubuntu_code: focal ubuntu_ver: 2004 - # TODO update comment ID, these are experimental IDs of issue #14669 - comment_id: 2658267907 - # - ubuntu_code: jammy - # ubuntu_ver: 2204 - # comment_id: 2658268060 + - ubuntu_code: jammy + ubuntu_ver: 2204 name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest From a1ebe6dbb0662a8b027ba5a59d8d4b0997679e24 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:24:38 +0900 Subject: [PATCH 102/139] Fix duplicated artifact issue ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8708467a15e..c12c5ad7ffb 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -77,8 +77,10 @@ jobs: include: - ubuntu_code: focal ubuntu_ver: 2004 + upload_artifact: false - ubuntu_code: jammy ubuntu_ver: 2204 + upload_artifact: true # only this artifact will be shared name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest @@ -149,6 +151,7 @@ jobs: "${{ inputs.cirint_description }}" -b - name: Craete original tarball + if: matrix.upload_artifact == true run: | cd ${{ env.NNCC_BUILD }} tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} @@ -161,7 +164,11 @@ jobs: # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - debuild -S -us -uc + if [[ "${{ matrix.upload_artifact }}" == "true" ]]; then + debuild -S -us -uc + else + debuild -S -us -uc -sd # without *.orig.tar.xz + fi debsign -k${FPR} ../circle-interpreter_*.changes - name: Upload to Launchpad @@ -173,7 +180,7 @@ jobs: dput ppa:circletools/nightly ${{ env.CHANGE_FILE }} - name: Upload artifact; circle-interpreter - id: upload + if: matrix.upload_artifact == true uses: actions/upload-artifact@v4 with: name: circle-interpreter_${{ env.VERSION }} From 67b4c02d1ee77a9449da940de1a429ec8954830e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:48:19 +0900 Subject: [PATCH 103/139] Add docker credential and remove if statement for generating tarball ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index c12c5ad7ffb..b77a260d342 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -87,6 +87,9 @@ jobs: runs-on: [ self-hosted, shs-park ] container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} + credentials: + username: ${{ secrets.NNFW_DOCKERHUB_USERNAME }} + password: ${{ secrets.NNFW_DOCKERHUB_TOKEN }} options: --user root env: VERSION: ${{ needs.prepare.outputs.version }} @@ -151,7 +154,6 @@ jobs: "${{ inputs.cirint_description }}" -b - name: Craete original tarball - if: matrix.upload_artifact == true run: | cd ${{ env.NNCC_BUILD }} tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} From bae412f862894833a334f0db214f2821f2d26df2 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 30 Apr 2025 16:50:45 +0900 Subject: [PATCH 104/139] revise credential names ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index b77a260d342..8eca1ff29bd 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -88,8 +88,8 @@ jobs: container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} credentials: - username: ${{ secrets.NNFW_DOCKERHUB_USERNAME }} - password: ${{ secrets.NNFW_DOCKERHUB_TOKEN }} + username: ${{ secrets.NNFW_DOCKER_USERNAME }} + password: ${{ secrets.NNFW_DOCKER_TOKEN }} options: --user root env: VERSION: ${{ needs.prepare.outputs.version }} From 855ae70038733ec77f98e1a67c5fe7e18a43f4d6 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 7 May 2025 14:31:56 +0900 Subject: [PATCH 105/139] This removes the use of root privileges in the workflow. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 8eca1ff29bd..dde90cdc9e6 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -90,7 +90,7 @@ jobs: credentials: username: ${{ secrets.NNFW_DOCKER_USERNAME }} password: ${{ secrets.NNFW_DOCKER_TOKEN }} - options: --user root + # options: --user root env: VERSION: ${{ needs.prepare.outputs.version }} CHANGE_FILE: ${{ needs.prepare.outputs.changes_file }} @@ -104,10 +104,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install required packages - run: | - apt-get update - apt-get install -y curl + # - name: Install required packages + # run: | + # sudo apt-get update + # sudo apt-get install -y curl - name: Build without test run: | From 95dc5ddae9577cf172ba1412b40338b1253781a4 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 7 May 2025 21:03:12 +0900 Subject: [PATCH 106/139] Revise the version name for the branch name. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index dde90cdc9e6..3ac6a504175 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -48,6 +48,7 @@ jobs: version: ${{ steps.set-version.outputs.version }} changes_file: ${{ steps.set-version.outputs.changes_file }} tarball_file: ${{ steps.set-version.outputs.tarball_file }} + br_version: ${{ steps.set-version.outputs.br_version }} steps: - name: Set version id: set-version @@ -57,9 +58,11 @@ jobs: if [[ "$is_release" == "true" ]]; then version="$base_version" + br_version="$base_version" else release_date=$(date +%Y%m%d%H%M) version="${base_version}~${release_date}" + br_version="${base_version}-${release_date}" fi changes_file="circle-interpreter_${version}_source.changes" @@ -198,6 +201,7 @@ jobs: needs: [ prepare, debian-release ] env: VERSION: ${{ needs.prepare.outputs.version }} + BR_VERSION: ${{ needs.prepare.outputs.br_version }} # TODO need to activate the branch condition # if: ${{ success() && github.ref == 'refs/heads/master' }} if: ${{ success() }} @@ -227,11 +231,11 @@ jobs: - name: Create PR branch and commit changelog run: | - BRANCH=auto/update-cirint-changelog-${{ env.VERSION }} + BRANCH=auto/update-cirint-changelog-${BR_VERSION} git checkout -b $BRANCH git add infra/debian/circle-interpreter/changelog git commit -m "[infra/debian] Update changelog for circle-interpreter" \ - -m "This updates the changelog for circle-interpreter_${{ env.VERSION }}." \ + -m "This updates the changelog for circle-interpreter_${VERSION}." \ -m "It is auto-generated PR from github workflow." \ -m "" \ -m "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park " From 5b03d1d8c7dba5be99b5a13a48952ad01b4dcb9f Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 7 May 2025 21:07:13 +0900 Subject: [PATCH 107/139] Fix a typo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 3ac6a504175..2447e08e277 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -156,7 +156,7 @@ jobs: --distribution "${{ matrix.ubuntu_code }}" \ "${{ inputs.cirint_description }}" -b - - name: Craete original tarball + - name: Create original tarball run: | cd ${{ env.NNCC_BUILD }} tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} From 6fef54b1965becc399d0219a57c3cd99275ebbf1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 9 May 2025 19:53:25 +0900 Subject: [PATCH 108/139] Separate distros by distro names ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 79 ++++++++++--------------- 1 file changed, 32 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 2447e08e277..2f7f5c7467f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -39,52 +39,39 @@ concurrency: cancel-in-progress: true jobs: - prepare: + configure: if: github.repository_owner == 'Samsung' || github.repository_owner == 'shs-park' + name: Set current date and time # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] outputs: - version: ${{ steps.set-version.outputs.version }} - changes_file: ${{ steps.set-version.outputs.changes_file }} - tarball_file: ${{ steps.set-version.outputs.tarball_file }} - br_version: ${{ steps.set-version.outputs.br_version }} + version: ${{ steps.set-datetime.outputs.version }} + br_version: ${{ steps.set-datetime.outputs.br_version }} steps: - - name: Set version - id: set-version + - name: Set date and time + id: set-datetime run: | base_version="${{ inputs.cirint_version }}" is_release="${{ inputs.is_release }}" - if [[ "$is_release" == "true" ]]; then - version="$base_version" + version="${base_version}" br_version="$base_version" else release_date=$(date +%Y%m%d%H%M) version="${base_version}~${release_date}" br_version="${base_version}-${release_date}" fi - - changes_file="circle-interpreter_${version}_source.changes" - tarball_file="circle-interpreter_${version}.orig.tar.xz" - echo "version=${version}" >> $GITHUB_OUTPUT - echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT - echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + echo "br_version=${br_version}" >> $GITHUB_OUTPUT debian-release: - needs: prepare + needs: configure strategy: matrix: - # TODO activate jammy - include: - - ubuntu_code: focal - ubuntu_ver: 2004 - upload_artifact: false - - ubuntu_code: jammy - ubuntu_ver: 2204 - upload_artifact: true # only this artifact will be shared - name: circle-interpreter ubuntu ${{ matrix.ubuntu_ver }} + # TODO activate noble + ubuntu_code: [ focal, jammy ] + name: circle-interpreter ubuntu ${{ matrix.ubuntu_code }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] @@ -95,23 +82,25 @@ jobs: password: ${{ secrets.NNFW_DOCKER_TOKEN }} # options: --user root env: - VERSION: ${{ needs.prepare.outputs.version }} - CHANGE_FILE: ${{ needs.prepare.outputs.changes_file }} - TARBALL_FILE: ${{ needs.prepare.outputs.tarball_file }} NNCC_BUILD: build NNCC_WORKSPACE: build/release NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp steps: + - name: Prepare, set distro versions + id: prepare + run: | + VERSION="${{ needs.configure.outputs.version }}~${{ matrix.ubuntu_code }}" + changes_file="circle-interpreter_${VERSION}_source.changes" + tarball_file="circle-interpreter_${VERSION}.orig.tar.xz" + echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT + echo "changes_file=${changes_file}" >> $GITHUB_OUTPUT + echo "tarball_file=${tarball_file}" >> $GITHUB_OUTPUT + - name: Checkout uses: actions/checkout@v4 - # - name: Install required packages - # run: | - # sudo apt-get update - # sudo apt-get install -y curl - - name: Build without test run: | CIR_INTP_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" @@ -152,14 +141,14 @@ jobs: cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${{ env.VERSION }}" \ + dch -v "${{ steps.prepare.outcome.VERSION }}" \ --distribution "${{ matrix.ubuntu_code }}" \ "${{ inputs.cirint_description }}" -b - name: Create original tarball run: | cd ${{ env.NNCC_BUILD }} - tar -caf ${{ env.TARBALL_FILE }} ${{ env.CIRINTP_PREFIX }} + tar -caf ${{ steps.prepare.outputs.tarball_file }} ${{ env.CIRINTP_PREFIX }} - name: Signing with debuild and debsign run: | @@ -169,11 +158,7 @@ jobs: # get fingerprint FPR=$(gpg --list-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }') echo "$FPR:6:" | gpg --import-ownertrust - if [[ "${{ matrix.upload_artifact }}" == "true" ]]; then - debuild -S -us -uc - else - debuild -S -us -uc -sd # without *.orig.tar.xz - fi + debuild -S -us -uc debsign -k${FPR} ../circle-interpreter_*.changes - name: Upload to Launchpad @@ -182,29 +167,29 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.LAUNCHPAD_NNFW_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - dput ppa:circletools/nightly ${{ env.CHANGE_FILE }} + dput ppa:circletools/nightly ${{ steps.prepare.outputs.changes_file }} - name: Upload artifact; circle-interpreter - if: matrix.upload_artifact == true uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ env.VERSION }} + name: circle-interpreter_${{ steps.prepare.outputs.version }} retention-days: 3 path: | - ${{ env.NNCC_BUILD }}/${{ env.TARBALL_FILE }} + ${{ env.NNCC_BUILD }}/${{ steps.prepare.outputs.tarball_file }} create-pr-on-success: name: Create changelog update PR on success # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] - needs: [ prepare, debian-release ] + needs: debian-release env: - VERSION: ${{ needs.prepare.outputs.version }} + VERSION: ${{ needs.prepare.outputs.VERSION }} BR_VERSION: ${{ needs.prepare.outputs.br_version }} # TODO need to activate the branch condition # if: ${{ success() && github.ref == 'refs/heads/master' }} - if: ${{ success() }} + # if: ${{ success() }} + if: false permissions: contents: write pull-requests: write From aedea84aea7d850f047cc791b0b9f5063ac0334e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 9 May 2025 20:12:33 +0900 Subject: [PATCH 109/139] Fix a typo ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 2f7f5c7467f..dfe3240f96f 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -141,7 +141,7 @@ jobs: cp -rf ../../infra/debian/circle-interpreter ./debian export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" - dch -v "${{ steps.prepare.outcome.VERSION }}" \ + dch -v "${{ steps.prepare.outputs.VERSION }}" \ --distribution "${{ matrix.ubuntu_code }}" \ "${{ inputs.cirint_description }}" -b From aecdcf464d114f12d78d6fc3149ebd48a2c616eb Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 12 May 2025 15:41:30 +0900 Subject: [PATCH 110/139] Remove unised makefile for circle-interpreter debian package ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/copyright | 1 - 1 file changed, 1 deletion(-) diff --git a/infra/debian/circle-interpreter/copyright b/infra/debian/circle-interpreter/copyright index 1717bb3da3f..2e6de3eded1 100644 --- a/infra/debian/circle-interpreter/copyright +++ b/infra/debian/circle-interpreter/copyright @@ -11,4 +11,3 @@ License: Apache-2.0 On Debian systems, the full text of the Apache License Version 2.0 can be found in: /usr/share/common-licenses/Apache-2.0 - From cf02ce9f6938a32c9ce879013ed2a188ea761196 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 12 May 2025 18:15:12 +0900 Subject: [PATCH 111/139] This will allow the source-is-missing error ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../source/lintian-overrides | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/infra/debian/circle-interpreter/source/lintian-overrides b/infra/debian/circle-interpreter/source/lintian-overrides index 2fabb7a90d8..35b017f9344 100644 --- a/infra/debian/circle-interpreter/source/lintian-overrides +++ b/infra/debian/circle-interpreter/source/lintian-overrides @@ -1,26 +1,25 @@ -circle-interpreter source: source-is-missing build/debian.install/bin/circle-eval-diff -circle-interpreter source: source-is-missing build/debian.install/bin/circle-interpreter -circle-interpreter source: source-is-missing build/debian.install/bin/circle-mpqsolver -circle-interpreter source: source-is-missing build/debian.install/bin/circle-operator -circle-interpreter source: source-is-missing build/debian.install/bin/circle-opselector -circle-interpreter source: source-is-missing build/debian.install/bin/circle-partitioner -circle-interpreter source: source-is-missing build/debian.install/bin/circle-quantizer -circle-interpreter source: source-is-missing build/debian.install/bin/circle-resizer -circle-interpreter source: source-is-missing build/debian.install/bin/circle-tensordump -circle-interpreter source: source-is-missing build/debian.install/bin/circle2circle -circle-interpreter source: source-is-missing build/debian.install/bin/circle_execution_plan -circle-interpreter source: source-is-missing build/debian.install/bin/circle_input_names -circle-interpreter source: source-is-missing build/debian.install/bin/circle_part_driver -circle-interpreter source: source-is-missing build/debian.install/bin/circledump -circle-interpreter source: source-is-missing build/debian.install/bin/dalgona -circle-interpreter source: source-is-missing build/debian.install/bin/fme-apply -circle-interpreter source: source-is-missing build/debian.install/bin/fme-detect -circle-interpreter source: source-is-missing build/debian.install/bin/luci_eval_driver -circle-interpreter source: source-is-missing build/debian.install/bin/one-version -circle-interpreter source: source-is-missing build/debian.install/bin/q-implant -circle-interpreter source: source-is-missing build/debian.install/bin/record-minmax -circle-interpreter source: source-is-missing build/debian.install/bin/tflchef -circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-file -circle-interpreter source: source-is-missing build/debian.install/bin/tflchef-reverse -circle-interpreter source: source-is-missing build/debian.install/bin/tflite2circle - +circle-interpreter source: source-is-missing build/release.install/bin/circle-eval-diff +circle-interpreter source: source-is-missing build/release.install/bin/circle-interpreter +circle-interpreter source: source-is-missing build/release.install/bin/circle-mpqsolver +circle-interpreter source: source-is-missing build/release.install/bin/circle-operator +circle-interpreter source: source-is-missing build/release.install/bin/circle-opselector +circle-interpreter source: source-is-missing build/release.install/bin/circle-partitioner +circle-interpreter source: source-is-missing build/release.install/bin/circle-quantizer +circle-interpreter source: source-is-missing build/release.install/bin/circle-resizer +circle-interpreter source: source-is-missing build/release.install/bin/circle-tensordump +circle-interpreter source: source-is-missing build/release.install/bin/circle2circle +circle-interpreter source: source-is-missing build/release.install/bin/circle_execution_plan +circle-interpreter source: source-is-missing build/release.install/bin/circle_input_names +circle-interpreter source: source-is-missing build/release.install/bin/circle_part_driver +circle-interpreter source: source-is-missing build/release.install/bin/circledump +circle-interpreter source: source-is-missing build/release.install/bin/dalgona +circle-interpreter source: source-is-missing build/release.install/bin/fme-apply +circle-interpreter source: source-is-missing build/release.install/bin/fme-detect +circle-interpreter source: source-is-missing build/release.install/bin/luci_eval_driver +circle-interpreter source: source-is-missing build/release.install/bin/one-version +circle-interpreter source: source-is-missing build/release.install/bin/q-implant +circle-interpreter source: source-is-missing build/release.install/bin/record-minmax +circle-interpreter source: source-is-missing build/release.install/bin/tflchef +circle-interpreter source: source-is-missing build/release.install/bin/tflchef-file +circle-interpreter source: source-is-missing build/release.install/bin/tflchef-reverse +circle-interpreter source: source-is-missing build/release.install/bin/tflite2circle From 5a6eb410a5f9f85d77cd453d2dc34d7042e20060 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 12 May 2025 18:36:19 +0900 Subject: [PATCH 112/139] Surpress warnings by adding source-is-missing info ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../source/lintian-overrides | 59 +++++++++++-------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/infra/debian/circle-interpreter/source/lintian-overrides b/infra/debian/circle-interpreter/source/lintian-overrides index 35b017f9344..a3759b86ed2 100644 --- a/infra/debian/circle-interpreter/source/lintian-overrides +++ b/infra/debian/circle-interpreter/source/lintian-overrides @@ -1,25 +1,34 @@ -circle-interpreter source: source-is-missing build/release.install/bin/circle-eval-diff -circle-interpreter source: source-is-missing build/release.install/bin/circle-interpreter -circle-interpreter source: source-is-missing build/release.install/bin/circle-mpqsolver -circle-interpreter source: source-is-missing build/release.install/bin/circle-operator -circle-interpreter source: source-is-missing build/release.install/bin/circle-opselector -circle-interpreter source: source-is-missing build/release.install/bin/circle-partitioner -circle-interpreter source: source-is-missing build/release.install/bin/circle-quantizer -circle-interpreter source: source-is-missing build/release.install/bin/circle-resizer -circle-interpreter source: source-is-missing build/release.install/bin/circle-tensordump -circle-interpreter source: source-is-missing build/release.install/bin/circle2circle -circle-interpreter source: source-is-missing build/release.install/bin/circle_execution_plan -circle-interpreter source: source-is-missing build/release.install/bin/circle_input_names -circle-interpreter source: source-is-missing build/release.install/bin/circle_part_driver -circle-interpreter source: source-is-missing build/release.install/bin/circledump -circle-interpreter source: source-is-missing build/release.install/bin/dalgona -circle-interpreter source: source-is-missing build/release.install/bin/fme-apply -circle-interpreter source: source-is-missing build/release.install/bin/fme-detect -circle-interpreter source: source-is-missing build/release.install/bin/luci_eval_driver -circle-interpreter source: source-is-missing build/release.install/bin/one-version -circle-interpreter source: source-is-missing build/release.install/bin/q-implant -circle-interpreter source: source-is-missing build/release.install/bin/record-minmax -circle-interpreter source: source-is-missing build/release.install/bin/tflchef -circle-interpreter source: source-is-missing build/release.install/bin/tflchef-file -circle-interpreter source: source-is-missing build/release.install/bin/tflchef-reverse -circle-interpreter source: source-is-missing build/release.install/bin/tflite2circle +circle-interpreter source: source-is-missing circle-eval-diff +circle-interpreter source: source-is-missing circle-interpreter +circle-interpreter source: source-is-missing circle-mpqsolver +circle-interpreter source: source-is-missing circle-operator +circle-interpreter source: source-is-missing circle-opselector +circle-interpreter source: source-is-missing circle-partitioner +circle-interpreter source: source-is-missing circle-quantizer +circle-interpreter source: source-is-missing circle-resizer +circle-interpreter source: source-is-missing circle-tensordump +circle-interpreter source: source-is-missing circle2circle +circle-interpreter source: source-is-missing circle_execution_plan +circle-interpreter source: source-is-missing circle_input_names +circle-interpreter source: source-is-missing circle_part_driver +circle-interpreter source: source-is-missing circledump +circle-interpreter source: source-is-missing dalgona +circle-interpreter source: source-is-missing fme-apply +circle-interpreter source: source-is-missing fme-detect +circle-interpreter source: source-is-missing luci_eval_driver +circle-interpreter source: source-is-missing one-version +circle-interpreter source: source-is-missing q-implant +circle-interpreter source: source-is-missing record-minmax +circle-interpreter source: source-is-missing tflchef +circle-interpreter source: source-is-missing tflchef-file +circle-interpreter source: source-is-missing tflchef-reverse +circle-interpreter source: source-is-missing tflite2circle +circle-interpreter source: source-is-missing libloco.so +circle-interpreter source: source-is-missing libluci_env.so +circle-interpreter source: source-is-missing libluci_import.so +circle-interpreter source: source-is-missing libluci_interpreter.so +circle-interpreter source: source-is-missing libluci_lang.so +circle-interpreter source: source-is-missing libluci_log.so +circle-interpreter source: source-is-missing libluci_logex.so +circle-interpreter source: source-is-missing libluci_plan.so +circle-interpreter source: source-is-missing libluci_profile.so From b75867d6f99475b35066da3af452de2c446ca080 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 12 May 2025 18:47:04 +0900 Subject: [PATCH 113/139] Clean up some source-is-missing items ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../source/lintian-overrides | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/infra/debian/circle-interpreter/source/lintian-overrides b/infra/debian/circle-interpreter/source/lintian-overrides index a3759b86ed2..82b292ca660 100644 --- a/infra/debian/circle-interpreter/source/lintian-overrides +++ b/infra/debian/circle-interpreter/source/lintian-overrides @@ -1,28 +1,4 @@ -circle-interpreter source: source-is-missing circle-eval-diff circle-interpreter source: source-is-missing circle-interpreter -circle-interpreter source: source-is-missing circle-mpqsolver -circle-interpreter source: source-is-missing circle-operator -circle-interpreter source: source-is-missing circle-opselector -circle-interpreter source: source-is-missing circle-partitioner -circle-interpreter source: source-is-missing circle-quantizer -circle-interpreter source: source-is-missing circle-resizer -circle-interpreter source: source-is-missing circle-tensordump -circle-interpreter source: source-is-missing circle2circle -circle-interpreter source: source-is-missing circle_execution_plan -circle-interpreter source: source-is-missing circle_input_names -circle-interpreter source: source-is-missing circle_part_driver -circle-interpreter source: source-is-missing circledump -circle-interpreter source: source-is-missing dalgona -circle-interpreter source: source-is-missing fme-apply -circle-interpreter source: source-is-missing fme-detect -circle-interpreter source: source-is-missing luci_eval_driver -circle-interpreter source: source-is-missing one-version -circle-interpreter source: source-is-missing q-implant -circle-interpreter source: source-is-missing record-minmax -circle-interpreter source: source-is-missing tflchef -circle-interpreter source: source-is-missing tflchef-file -circle-interpreter source: source-is-missing tflchef-reverse -circle-interpreter source: source-is-missing tflite2circle circle-interpreter source: source-is-missing libloco.so circle-interpreter source: source-is-missing libluci_env.so circle-interpreter source: source-is-missing libluci_import.so From 1850d97d59e43f1ca99867f5d417e6dac4e6bd6e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 18:04:45 +0900 Subject: [PATCH 114/139] Remove unused makefile: make-cirint ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- infra/debian/circle-interpreter/make-cirint | 36 --------------------- 1 file changed, 36 deletions(-) delete mode 100644 infra/debian/circle-interpreter/make-cirint diff --git a/infra/debian/circle-interpreter/make-cirint b/infra/debian/circle-interpreter/make-cirint deleted file mode 100644 index 0221602dc83..00000000000 --- a/infra/debian/circle-interpreter/make-cirint +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/make -f - -CURRENT_DIR=$(shell pwd) -export NNCC_WORKSPACE=build/debian -export NNCC_INSTALL_PREFIX=${CURRENT_DIR}/${NNCC_WORKSPACE}.install - -%: - dh $@ - -debian-clean: - rm -rf build - -debian-configure: - CIRCLEINT_ITEMS="angkor;cwrap;pepper-str;pepper-strcast;pepper-csv2vec;pp" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};oops;loco;logo-core;logo;locop" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};hermes;hermes-std;safemain;mio-circle08" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};luci-compute;luci;luci-interpreter" - CIRCLEINT_ITEMS="${CIRCLEINT_ITEMS};foder;arser;vconone;circle-interpreter" - - ./nncc configure \ - -DENABLE_STRICT_BUILD=ON \ - -DENABLE_TEST=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DEXTERNALS_BUILD_THREADS=4 \ - -DCMAKE_INSTALL_PREFIX=${NNCC_INSTALL_PREFIX} \ - -DBUILD_WHITELIST="${CIRCLEINT_ITEMS}" - -debian-build: - ./nncc build -j16 - -debian-test: - # skip test - -debian-install: - ./nncc install - From 095207bfd906c4cac9b62c26fce23a21f4d89d51 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 22:03:28 +0900 Subject: [PATCH 115/139] Split the `changelog` files by distribution. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../circle-interpreter/{changelog => changelog-focal} | 0 infra/debian/circle-interpreter/changelog-jammy | 11 +++++++++++ 2 files changed, 11 insertions(+) rename infra/debian/circle-interpreter/{changelog => changelog-focal} (100%) create mode 100644 infra/debian/circle-interpreter/changelog-jammy diff --git a/infra/debian/circle-interpreter/changelog b/infra/debian/circle-interpreter/changelog-focal similarity index 100% rename from infra/debian/circle-interpreter/changelog rename to infra/debian/circle-interpreter/changelog-focal diff --git a/infra/debian/circle-interpreter/changelog-jammy b/infra/debian/circle-interpreter/changelog-jammy new file mode 100644 index 00000000000..c06c28a8db0 --- /dev/null +++ b/infra/debian/circle-interpreter/changelog-jammy @@ -0,0 +1,11 @@ +circle-interpreter (1.30.0~20250424.2227) focal; urgency=medium + + * Daily build with timestamp. + + -- SeunghoPark Thu, 24 Apr 2025 22:27:41 +0900 + +circle-interpreter (1.30.0) focal; urgency=low + + * First circle-interpreter Debian package release for developers. + + -- SeunghoPark Thu, 24 Apr 2025 16:07:00 +0900 From 236b79327cbf589b06e114a71094f3874ee52d6f Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 22:05:40 +0900 Subject: [PATCH 116/139] Revise the create PR on success ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 79 ++++++++++++++++++++----- 1 file changed, 65 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index dfe3240f96f..06f1db57d00 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -139,6 +139,8 @@ jobs: run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian + mv ./debian/changelog-${{ matrix.ubuntu_code }} ./debian/changelog + rm -f ./debian/changelog-* export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" dch -v "${{ steps.prepare.outputs.VERSION }}" \ @@ -169,32 +171,80 @@ jobs: chmod 600 ~/.ssh/id_rsa dput ppa:circletools/nightly ${{ steps.prepare.outputs.changes_file }} - - name: Upload artifact; circle-interpreter + - name: Upload artifact, circle-interpreter uses: actions/upload-artifact@v4 with: - name: circle-interpreter_${{ steps.prepare.outputs.version }} + name: circle-interpreter_${{ steps.prepare.outputs.VERSION }} retention-days: 3 path: | ${{ env.NNCC_BUILD }}/${{ steps.prepare.outputs.tarball_file }} - create-pr-on-success: - name: Create changelog update PR on success + create-changelog-artifact: + needs: [ configure, debian-release ] + # TODO need to activate the branch condition + # if: ${{ success() && github.ref == 'refs/heads/master' }} + if: ${{ success() }} # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] - needs: debian-release - env: - VERSION: ${{ needs.prepare.outputs.VERSION }} - BR_VERSION: ${{ needs.prepare.outputs.br_version }} + + steps: + - name: Prepare, set distro versions + id: prepare + run: | + VERSION="${{ needs.configure.outputs.version }}~${{ matrix.ubuntu_code }}" + echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT + mkdir -p changelogs + + - name: Download tarball, focal + uses: actions/download-artifact@v4 + with: + name: circle-interpreter_${{ needs.configure.outputs.version }}-focal + path: focal + + - name: Download tarball, jammy + uses: actions/download-artifact@v4 + with: + name: circle-interpreter_${{ needs.configure.outputs.version }}-jammy + path: jammy + + - name: Copy changelogs + run: | + ls -alh # TODO remove this + for distro in focal jammy; do + cp ${distro}/cirintp/debian changelog changelogs/changelog-${distro} + done + ls -alh ./changelogs/ # TODO remove this + + - name: Upload artifact, changelogs + uses: actions/upload-artifact@v4 + with: + name: changelogs + retention-days: 3 + path: | + changelogs + + create-pr-on-success: + needs: [ configure, create-changelog-artifact ] # TODO need to activate the branch condition # if: ${{ success() && github.ref == 'refs/heads/master' }} - # if: ${{ success() }} - if: false + if: ${{ success() }} + # TODO change to the 'ubuntu-latest' + #runs-on: ubuntu-latest + runs-on: [ self-hosted, shs-park ] + env: + BR_VERSION: ${{ needs.configure.outputs.br_version }} permissions: contents: write pull-requests: write steps: + - name: Prepare, set distro versions + id: prepare + run: | + VERSION="${{ needs.configure.outputs.version }}" + echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT + - name: Checkout uses: actions/checkout@v4 @@ -206,13 +256,14 @@ jobs: - name: Download tarball uses: actions/download-artifact@v4 with: - name: circle-interpreter_${{ env.VERSION }} + name: changelogs + path: ./ - name: Extract changelog run: | - tar -xaf circle-interpreter_${VERSION}.orig.tar.xz - cp cirintp/debian/changelog \ - infra/debian/circle-interpreter/changelog + ls -alh # TODO remove this + cp changelogs/changelog-* \ + infra/debian/circle-interpreter/ - name: Create PR branch and commit changelog run: | From d742e9bd2c0f1294ab4d9a3e8e3f2bb3078a931c Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 22:23:30 +0900 Subject: [PATCH 117/139] Fix name and path for the artifacts ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 06f1db57d00..12c1ae20f31 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -189,27 +189,22 @@ jobs: runs-on: [ self-hosted, shs-park ] steps: - - name: Prepare, set distro versions - id: prepare - run: | - VERSION="${{ needs.configure.outputs.version }}~${{ matrix.ubuntu_code }}" - echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT - mkdir -p changelogs - - name: Download tarball, focal uses: actions/download-artifact@v4 with: - name: circle-interpreter_${{ needs.configure.outputs.version }}-focal + name: circle-interpreter_${{ needs.configure.outputs.version }}~focal path: focal - name: Download tarball, jammy uses: actions/download-artifact@v4 with: - name: circle-interpreter_${{ needs.configure.outputs.version }}-jammy + name: circle-interpreter_${{ needs.configure.outputs.version }}~jammy path: jammy - name: Copy changelogs run: | + ls -alh # TODO remove this + mkdir -p changelogs ls -alh # TODO remove this for distro in focal jammy; do cp ${distro}/cirintp/debian changelog changelogs/changelog-${distro} From fe49cf21e2fba813d8b8106cdb749277d6cae928 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 22:56:11 +0900 Subject: [PATCH 118/139] Fix path for the changelogs ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 12c1ae20f31..4a0503f353d 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -193,13 +193,11 @@ jobs: uses: actions/download-artifact@v4 with: name: circle-interpreter_${{ needs.configure.outputs.version }}~focal - path: focal - name: Download tarball, jammy uses: actions/download-artifact@v4 with: name: circle-interpreter_${{ needs.configure.outputs.version }}~jammy - path: jammy - name: Copy changelogs run: | @@ -207,7 +205,10 @@ jobs: mkdir -p changelogs ls -alh # TODO remove this for distro in focal jammy; do - cp ${distro}/cirintp/debian changelog changelogs/changelog-${distro} + mkdir ${distro} + tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${distro}.orig.tar.xz \ + -C ${distro} + cp ${distro}/cirintp/debian/changelog changelogs/changelog-${distro} done ls -alh ./changelogs/ # TODO remove this @@ -252,7 +253,6 @@ jobs: uses: actions/download-artifact@v4 with: name: changelogs - path: ./ - name: Extract changelog run: | From 4261f16a8011ba490f410c6e693a977168b9f256 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Tue, 13 May 2025 23:18:58 +0900 Subject: [PATCH 119/139] Fix the changelog path ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/build-circle-intp.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/build-circle-intp.yml index 4a0503f353d..f54d1db7075 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/build-circle-intp.yml @@ -201,9 +201,7 @@ jobs: - name: Copy changelogs run: | - ls -alh # TODO remove this mkdir -p changelogs - ls -alh # TODO remove this for distro in focal jammy; do mkdir ${distro} tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${distro}.orig.tar.xz \ @@ -257,14 +255,14 @@ jobs: - name: Extract changelog run: | ls -alh # TODO remove this - cp changelogs/changelog-* \ + cp changelog-* \ infra/debian/circle-interpreter/ - name: Create PR branch and commit changelog run: | BRANCH=auto/update-cirint-changelog-${BR_VERSION} git checkout -b $BRANCH - git add infra/debian/circle-interpreter/changelog + git add infra/debian/circle-interpreter/changelog-* git commit -m "[infra/debian] Update changelog for circle-interpreter" \ -m "This updates the changelog for circle-interpreter_${VERSION}." \ -m "It is auto-generated PR from github workflow." \ From 4fa20e12e9301e55ac27ef9bd990a1a4d2cad302 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 10:45:53 +0900 Subject: [PATCH 120/139] Rename the workflow name ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- ...build-circle-intp.yml => pub-circle-int-launchpad.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{build-circle-intp.yml => pub-circle-int-launchpad.yml} (98%) diff --git a/.github/workflows/build-circle-intp.yml b/.github/workflows/pub-circle-int-launchpad.yml similarity index 98% rename from .github/workflows/build-circle-intp.yml rename to .github/workflows/pub-circle-int-launchpad.yml index f54d1db7075..36fac241366 100644 --- a/.github/workflows/build-circle-intp.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -1,4 +1,4 @@ -name: Build circle-interpreter +name: Publish circle-interpreter to Launchpad on: # TODO turn on schedule @@ -264,7 +264,7 @@ jobs: git checkout -b $BRANCH git add infra/debian/circle-interpreter/changelog-* git commit -m "[infra/debian] Update changelog for circle-interpreter" \ - -m "This updates the changelog for circle-interpreter_${VERSION}." \ + -m "This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}." \ -m "It is auto-generated PR from github workflow." \ -m "" \ -m "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park " @@ -277,8 +277,8 @@ jobs: gh pr create \ --title "[infra/debian] Update changelog for circle-interpreter" \ --body \ - "$(cat < Date: Wed, 14 May 2025 14:31:46 +0900 Subject: [PATCH 121/139] Revise the step for Creating PR ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 36fac241366..f5b6c235a27 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -278,12 +278,12 @@ jobs: --title "[infra/debian] Update changelog for circle-interpreter" \ --body \ "$(cat <<-EOF - This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. - This PR includes updated changelog after successful debian build. - It is auto-generated PR from github workflow. +This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. +This PR includes updated changelog after successful debian build. +It is auto-generated PR from github workflow. - ONE-DCO-1.0-Signed-off-by: Seungho Henry Park - EOF +ONE-DCO-1.0-Signed-off-by: Seungho Henry Park +EOF )" --head $BRANCH \ --base master From 219dafca1c052c036318112588f0143b552f45b0 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 15:03:03 +0900 Subject: [PATCH 122/139] indent of EOF usage ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index f5b6c235a27..cdb6f0f0e52 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -23,7 +23,8 @@ on: required: false default: 'nnfw@samsung.com' is_release: - description: 'Is this a release version? + description: | + 'Is this a release version? Set to false to append date-based subversion. (true/false)' required: false @@ -277,13 +278,13 @@ jobs: gh pr create \ --title "[infra/debian] Update changelog for circle-interpreter" \ --body \ - "$(cat <<-EOF -This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. -This PR includes updated changelog after successful debian build. -It is auto-generated PR from github workflow. - -ONE-DCO-1.0-Signed-off-by: Seungho Henry Park -EOF + "$(cat <" + EOF )" --head $BRANCH \ --base master From 5e361fffd5123cce6271acf8d0972944cb939827 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 15:40:22 +0900 Subject: [PATCH 123/139] Test indent for usage of cat/EOF ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index cdb6f0f0e52..c2454a64875 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -279,12 +279,12 @@ jobs: --title "[infra/debian] Update changelog for circle-interpreter" \ --body \ "$(cat <" - EOF - )" +This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. +This PR includes updated changelog after successful debian build. +It is auto-generated PR from github workflow. +. +echo "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park +EOF + )" \ --head $BRANCH \ --base master From b1c80d5f3a5b599367aee4db173e55fefd659aa5 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 15:45:30 +0900 Subject: [PATCH 124/139] Test indent for usage of cat/EOF ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index c2454a64875..c34066bf60a 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -277,14 +277,13 @@ jobs: run: | gh pr create \ --title "[infra/debian] Update changelog for circle-interpreter" \ - --body \ - "$(cat < + +ONE-DCO-1.0-Signed-off-by: Seungho Henry Park EOF - )" \ + )" \ --head $BRANCH \ --base master From 9bf26ce0493f2e15d21008ae94e7e8bebed5952b Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 15:46:25 +0900 Subject: [PATCH 125/139] Test indent for usage of cat/EO ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index c34066bf60a..6e89ee23c7c 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -278,12 +278,12 @@ jobs: gh pr create \ --title "[infra/debian] Update changelog for circle-interpreter" \ --body "$(cat < -EOF + This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. + This PR includes updated changelog after successful debian build. + It is auto-generated PR from github workflow. + . + ONE-DCO-1.0-Signed-off-by: Seungho Henry Park + EOF )" \ --head $BRANCH \ --base master From 014b44b2fdaf13b9c6488186ce490e45e2c2c6c9 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 17:37:40 +0900 Subject: [PATCH 126/139] Test indent for usage of cat/EOF ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../workflows/pub-circle-int-launchpad.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 6e89ee23c7c..69c950dd860 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -275,15 +275,15 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create \ - --title "[infra/debian] Update changelog for circle-interpreter" \ - --body "$(cat < - EOF - )" \ - --head $BRANCH \ - --base master + gh pr create \ + --title "[infra/debian] Update changelog for circle-interpreter" \ + --body "$(cat < + EOF + )" \ + --head $BRANCH \ + --base master From 37b39ed7cf97833030537bc6894612aa54be93f2 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 18:55:11 +0900 Subject: [PATCH 127/139] T_T ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 69c950dd860..4dfd6c3e544 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -262,14 +262,14 @@ jobs: - name: Create PR branch and commit changelog run: | BRANCH=auto/update-cirint-changelog-${BR_VERSION} - git checkout -b $BRANCH + git checkout -b ${BRANCH} git add infra/debian/circle-interpreter/changelog-* git commit -m "[infra/debian] Update changelog for circle-interpreter" \ -m "This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}." \ -m "It is auto-generated PR from github workflow." \ -m "" \ -m "ONE-DCO-1.0-Signed-off-by: Seungho Henry Park " - git push origin $BRANCH + git push origin ${BRANCH} - name: Create PR env: @@ -281,9 +281,9 @@ jobs: This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}. This PR includes updated changelog after successful debian build. It is auto-generated PR from github workflow. - . + ONE-DCO-1.0-Signed-off-by: Seungho Henry Park EOF )" \ - --head $BRANCH \ + --head ${BRANCH} \ --base master From ce03656f4cb6d3ffdc1078ec80eeb97f688c0fa1 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 19:11:16 +0900 Subject: [PATCH 128/139] Add quote to the arguments ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 4dfd6c3e544..ba94ab298ed 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -285,5 +285,5 @@ jobs: ONE-DCO-1.0-Signed-off-by: Seungho Henry Park EOF )" \ - --head ${BRANCH} \ - --base master + --head "${BRANCH}" \ + --base "master" From 74ee80555c22706ac55539ac05a7e90ff7ab814c Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Wed, 14 May 2025 19:14:15 +0900 Subject: [PATCH 129/139] Applying changes from origin ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index ba94ab298ed..d8b28225947 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -57,7 +57,7 @@ jobs: is_release="${{ inputs.is_release }}" if [[ "$is_release" == "true" ]]; then version="${base_version}" - br_version="$base_version" + br_version="${base_version}" else release_date=$(date +%Y%m%d%H%M) version="${base_version}~${release_date}" @@ -87,7 +87,6 @@ jobs: NNCC_WORKSPACE: build/release NNCC_INSTALL_PREFIX: ${{ github.workspace }}/build/release.install CIRINTP_PREFIX: cirintp - steps: - name: Prepare, set distro versions id: prepare From d726ffa3b6847fa2f83f9edb29b4ac88ebed4f7c Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 15 May 2025 13:29:03 +0900 Subject: [PATCH 130/139] Github Token usage ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index d8b28225947..62b96a31ed8 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -259,6 +259,8 @@ jobs: infra/debian/circle-interpreter/ - name: Create PR branch and commit changelog + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | BRANCH=auto/update-cirint-changelog-${BR_VERSION} git checkout -b ${BRANCH} @@ -274,6 +276,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + BRANCH=auto/update-cirint-changelog-${BR_VERSION} gh pr create \ --title "[infra/debian] Update changelog for circle-interpreter" \ --body "$(cat < Date: Thu, 15 May 2025 16:07:58 +0900 Subject: [PATCH 131/139] Setting GITHUB_TOKEN ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 62b96a31ed8..1445a5b8c31 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -274,7 +274,7 @@ jobs: - name: Create PR env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.SHSPARK_GITHUB_TOKEN }} run: | BRANCH=auto/update-cirint-changelog-${BR_VERSION} gh pr create \ From b7315151f8e23928c36f114e47b3b55bade37f94 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 15 May 2025 17:11:04 +0900 Subject: [PATCH 132/139] Unify the `changelog` files across all distributions. ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../circle-interpreter/{changelog-focal => changelog} | 0 infra/debian/circle-interpreter/changelog-jammy | 11 ----------- 2 files changed, 11 deletions(-) rename infra/debian/circle-interpreter/{changelog-focal => changelog} (100%) delete mode 100644 infra/debian/circle-interpreter/changelog-jammy diff --git a/infra/debian/circle-interpreter/changelog-focal b/infra/debian/circle-interpreter/changelog similarity index 100% rename from infra/debian/circle-interpreter/changelog-focal rename to infra/debian/circle-interpreter/changelog diff --git a/infra/debian/circle-interpreter/changelog-jammy b/infra/debian/circle-interpreter/changelog-jammy deleted file mode 100644 index c06c28a8db0..00000000000 --- a/infra/debian/circle-interpreter/changelog-jammy +++ /dev/null @@ -1,11 +0,0 @@ -circle-interpreter (1.30.0~20250424.2227) focal; urgency=medium - - * Daily build with timestamp. - - -- SeunghoPark Thu, 24 Apr 2025 22:27:41 +0900 - -circle-interpreter (1.30.0) focal; urgency=low - - * First circle-interpreter Debian package release for developers. - - -- SeunghoPark Thu, 24 Apr 2025 16:07:00 +0900 From 7f6e1a7bc681c291206960a08d57ec5cdb193629 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 15 May 2025 17:27:28 +0900 Subject: [PATCH 133/139] Simplify changelogs ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../workflows/pub-circle-int-launchpad.yml | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 1445a5b8c31..00c402bdd7d 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -139,8 +139,6 @@ jobs: run: | cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }} cp -rf ../../infra/debian/circle-interpreter ./debian - mv ./debian/changelog-${{ matrix.ubuntu_code }} ./debian/changelog - rm -f ./debian/changelog-* export DEBFULLNAME="${{ inputs.deb_fullname }}" export DEBEMAIL="${{ inputs.deb_email }}" dch -v "${{ steps.prepare.outputs.VERSION }}" \ @@ -187,28 +185,22 @@ jobs: # TODO change to the 'ubuntu-latest' #runs-on: ubuntu-latest runs-on: [ self-hosted, shs-park ] + env: + DEFAULT_DISTRO: jammy steps: - - name: Download tarball, focal - uses: actions/download-artifact@v4 - with: - name: circle-interpreter_${{ needs.configure.outputs.version }}~focal - - - name: Download tarball, jammy + - name: Download tarball, ${{ env.DEFAULT_DISTRO }} uses: actions/download-artifact@v4 with: - name: circle-interpreter_${{ needs.configure.outputs.version }}~jammy + name: circle-interpreter_${{ needs.configure.outputs.version }}~${{ env.DEFAULT_DISTRO }} - name: Copy changelogs run: | - mkdir -p changelogs - for distro in focal jammy; do - mkdir ${distro} - tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${distro}.orig.tar.xz \ - -C ${distro} - cp ${distro}/cirintp/debian/changelog changelogs/changelog-${distro} - done - ls -alh ./changelogs/ # TODO remove this + mkdir changelogs + mkdir ${{ env.DEFAULT_DISTRO }} + tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${{ env.DEFAULT_DISTRO }}.orig.tar.xz \ + -C ${{ env.DEFAULT_DISTRO }} + cp ${{ env.DEFAULT_DISTRO }}/cirintp/debian/changelog changelogs/changelog - name: Upload artifact, changelogs uses: actions/upload-artifact@v4 @@ -252,11 +244,9 @@ jobs: with: name: changelogs - - name: Extract changelog + - name: Update the changelog file run: | - ls -alh # TODO remove this - cp changelog-* \ - infra/debian/circle-interpreter/ + cp changelog infra/debian/circle-interpreter/ - name: Create PR branch and commit changelog env: @@ -264,7 +254,7 @@ jobs: run: | BRANCH=auto/update-cirint-changelog-${BR_VERSION} git checkout -b ${BRANCH} - git add infra/debian/circle-interpreter/changelog-* + git add infra/debian/circle-interpreter/changelog git commit -m "[infra/debian] Update changelog for circle-interpreter" \ -m "This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}." \ -m "It is auto-generated PR from github workflow." \ From ca38002801e9486f0c0bf08f707ab37c802bbdd8 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Thu, 15 May 2025 20:07:02 +0900 Subject: [PATCH 134/139] Clean up description ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 00c402bdd7d..e6bacc32c4b 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -23,8 +23,7 @@ on: required: false default: 'nnfw@samsung.com' is_release: - description: | - 'Is this a release version? + description: 'Is this a release version? Set to false to append date-based subversion. (true/false)' required: false From 5e85673daa0bc84eb6a5cce440081349fba2712e Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Fri, 16 May 2025 13:10:37 +0900 Subject: [PATCH 135/139] Remove unused comment ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index e6bacc32c4b..a276411916f 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -80,7 +80,6 @@ jobs: credentials: username: ${{ secrets.NNFW_DOCKER_USERNAME }} password: ${{ secrets.NNFW_DOCKER_TOKEN }} - # options: --user root env: NNCC_BUILD: build NNCC_WORKSPACE: build/release From ac4f875ecb49cbf9af01b5e4874e095178b4d873 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 19 May 2025 11:18:13 +0900 Subject: [PATCH 136/139] Give root privilege to the docker container ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index a276411916f..2d9261197b6 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -77,6 +77,7 @@ jobs: runs-on: [ self-hosted, shs-park ] container: image: nnfw/one-devtools:${{ matrix.ubuntu_code }} + options: --user root credentials: username: ${{ secrets.NNFW_DOCKER_USERNAME }} password: ${{ secrets.NNFW_DOCKER_TOKEN }} From faa7a3afbc93b63340a526a85e767293e8af67b0 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 19 May 2025 11:28:00 +0900 Subject: [PATCH 137/139] Revise the installation path for circle-interpreter ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .../circle-interpreter.install | 20 +++++++++---------- .../circle-interpreter.links | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/infra/debian/circle-interpreter/circle-interpreter.install b/infra/debian/circle-interpreter/circle-interpreter.install index 3e97ee7f198..d7e74e8d097 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.install +++ b/infra/debian/circle-interpreter/circle-interpreter.install @@ -1,13 +1,13 @@ # {FILES_TO_INSTALL} {DEST_DIR} # bin -bin/circle-interpreter usr/share/cirint/bin/ +bin/circle-interpreter usr/share/circletools/bin/ # lib -libloco.so usr/share/cirint/bin/ -libluci_env.so usr/share/cirint/bin/ -libluci_import.so usr/share/cirint/bin/ -libluci_interpreter.so usr/share/cirint/bin/ -libluci_lang.so usr/share/cirint/bin/ -libluci_logex.so usr/share/cirint/bin/ -libluci_log.so usr/share/cirint/bin/ -libluci_plan.so usr/share/cirint/bin/ -libluci_profile.so usr/share/cirint/bin/ +libloco.so usr/share/circletools/bin/ +libluci_env.so usr/share/circletools/bin/ +libluci_import.so usr/share/circletools/bin/ +libluci_interpreter.so usr/share/circletools/bin/ +libluci_lang.so usr/share/circletools/bin/ +libluci_logex.so usr/share/circletools/bin/ +libluci_log.so usr/share/circletools/bin/ +libluci_plan.so usr/share/circletools/bin/ +libluci_profile.so usr/share/circletools/bin/ diff --git a/infra/debian/circle-interpreter/circle-interpreter.links b/infra/debian/circle-interpreter/circle-interpreter.links index d718e1a665a..6b6723e0209 100644 --- a/infra/debian/circle-interpreter/circle-interpreter.links +++ b/infra/debian/circle-interpreter/circle-interpreter.links @@ -1,2 +1,2 @@ # bin -usr/share/cirint/bin/circle-interpreter usr/bin/circle-interpreter +usr/share/circletools/bin/circle-interpreter usr/bin/circle-interpreter From 7e9241eed73d82b38e4d0ebfeb74a3f03a1dd620 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 19 May 2025 13:28:14 +0900 Subject: [PATCH 138/139] New Line ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 2d9261197b6..71e830a4b96 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -186,7 +186,6 @@ jobs: runs-on: [ self-hosted, shs-park ] env: DEFAULT_DISTRO: jammy - steps: - name: Download tarball, ${{ env.DEFAULT_DISTRO }} uses: actions/download-artifact@v4 From dd5e0de0b31bdff777bd023de6210925737c2ed4 Mon Sep 17 00:00:00 2001 From: Seungho Henry Park Date: Mon, 19 May 2025 14:21:29 +0900 Subject: [PATCH 139/139] New line ONE-DCO-1.0-Signed-off-by: Seungho Henry Park --- .github/workflows/pub-circle-int-launchpad.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pub-circle-int-launchpad.yml b/.github/workflows/pub-circle-int-launchpad.yml index 71e830a4b96..c51dd2b4b59 100644 --- a/.github/workflows/pub-circle-int-launchpad.yml +++ b/.github/workflows/pub-circle-int-launchpad.yml @@ -221,7 +221,6 @@ jobs: permissions: contents: write pull-requests: write - steps: - name: Prepare, set distro versions id: prepare