From c8430bcfa2189fbb36871fa06bfba11e7b7437ca Mon Sep 17 00:00:00 2001 From: Sebastien L Date: Tue, 4 Jan 2022 17:02:08 -0500 Subject: [PATCH 1/4] more permissions! --- .github/workflows/esp-idf-v4.3-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/esp-idf-v4.3-build.yml b/.github/workflows/esp-idf-v4.3-build.yml index a1ca113a..10bf35b5 100644 --- a/.github/workflows/esp-idf-v4.3-build.yml +++ b/.github/workflows/esp-idf-v4.3-build.yml @@ -52,6 +52,8 @@ jobs: git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py2 + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/proto/*.py + cd server_certs;./getcert.sh;cat github.pem;cd .. shopt -s nocasematch From 3a99c65eb3c4632160bf0b2fd2fa3f8d173678db Mon Sep 17 00:00:00 2001 From: Sebastien L Date: Tue, 4 Jan 2022 17:12:51 -0500 Subject: [PATCH 2/4] Add verbosity to protogen --- .github/workflows/esp-idf-v4.3-build.yml | 12 ++++++------ .../spotify/cspot/bell/nanopb/generator/protoc | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/esp-idf-v4.3-build.yml b/.github/workflows/esp-idf-v4.3-build.yml index 10bf35b5..18fe30ad 100644 --- a/.github/workflows/esp-idf-v4.3-build.yml +++ b/.github/workflows/esp-idf-v4.3-build.yml @@ -47,12 +47,12 @@ jobs: key: ${{ runner.os }}-${{ matrix.node }} - name: Set build parameters run: | - git update-index --chmod=+x ./server_certs/getcert.sh - git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc - git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb - git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py - git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py2 - git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/proto/*.py + git update-index --chmod=+x /project/server_certs/getcert.sh + git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/protoc + git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb + git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/*.py + git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/*.py2 + git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/proto/*.py cd server_certs;./getcert.sh;cat github.pem;cd .. diff --git a/components/spotify/cspot/bell/nanopb/generator/protoc b/components/spotify/cspot/bell/nanopb/generator/protoc index 4b1512d0..0c733f4a 100644 --- a/components/spotify/cspot/bell/nanopb/generator/protoc +++ b/components/spotify/cspot/bell/nanopb/generator/protoc @@ -7,22 +7,25 @@ from nanopb_generator import invoke_protoc if __name__ == '__main__': # Add argument so that protoc-gen-nanopb gets found + print("Getting path to protoc-gen-nanopb") if getattr(sys, 'frozen', False): mypath = os.path.dirname(sys.executable) # For pyInstaller else: mypath = os.path.dirname(__file__) - + print("Looking for executable file name") if os.path.isfile(os.path.join(mypath, "protoc-gen-nanopb.exe")): protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb.exe") elif os.name == 'nt': protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb.bat") else: protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb") - + print("Found executable file name: " + protoc_gen_nanopb) args = sys.argv[1:] if os.path.isfile(protoc_gen_nanopb): args = ['--plugin=protoc-gen-nanopb=%s' % protoc_gen_nanopb] + args + # print the command line that we are about to execute + print("invoking protoc with parameters: ".join(args)) status = invoke_protoc(['protoc'] + args) sys.exit(status) From 9e21e302b81e04b1de27e97f5badbe41967c16fa Mon Sep 17 00:00:00 2001 From: Sebastien L Date: Tue, 4 Jan 2022 17:16:30 -0500 Subject: [PATCH 3/4] more attempts to figure out permissions --- .github/workflows/esp-idf-v4.3-build.yml | 12 ++++++------ .../cspot/bell/nanopb/generator/protoc-gen-nanopb | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/esp-idf-v4.3-build.yml b/.github/workflows/esp-idf-v4.3-build.yml index 18fe30ad..10bf35b5 100644 --- a/.github/workflows/esp-idf-v4.3-build.yml +++ b/.github/workflows/esp-idf-v4.3-build.yml @@ -47,12 +47,12 @@ jobs: key: ${{ runner.os }}-${{ matrix.node }} - name: Set build parameters run: | - git update-index --chmod=+x /project/server_certs/getcert.sh - git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/protoc - git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb - git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/*.py - git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/*.py2 - git update-index --chmod=+x /project/components/spotify/cspot/bell/nanopb/generator/proto/*.py + git update-index --chmod=+x ./server_certs/getcert.sh + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py2 + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/proto/*.py cd server_certs;./getcert.sh;cat github.pem;cd .. diff --git a/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb b/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb index 471a620b..71ef4c78 100644 --- a/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb +++ b/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb @@ -10,4 +10,5 @@ # --plugin= on the command line. MYPATH=$(dirname "$0") +echo "Executing $MYPATH/nanopb_generator.py " exec "$MYPATH/nanopb_generator.py" --protoc-plugin From 5cad1aeed69f333f5b7e6072f6d286010483d304 Mon Sep 17 00:00:00 2001 From: Sebastien L Date: Tue, 4 Jan 2022 17:27:40 -0500 Subject: [PATCH 4/4] more logs --- .../spotify/cspot/bell/nanopb/generator/proto/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py b/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py index 29153d40..d2f44ebb 100644 --- a/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py +++ b/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py @@ -30,7 +30,9 @@ if os.path.isfile(protosrc): cmd.append("-I={}".format(_builtin_proto_include)) try: + sys.stdout.write("Invoking:" + ' '.join(cmd) + "\n") invoke_protoc(argv=cmd) except: + sys.stdout.write("Failed to build nanopb_pb2.py: " + ' '.join(cmd) + "\n") sys.stderr.write("Failed to build nanopb_pb2.py: " + ' '.join(cmd) + "\n") raise