Merge pull request #712 from camptocamp/backport/711-to-1.3

[Backport 1.3] Fix publish in dev mode

.github/workflows/clean.yaml

@@ -1,7 +1,11 @@
 ---
 name: Clean docker hub tags
 
-on: delete
+on:
+  delete:
+  pull_request:
+    types:
+      - closed
 
 jobs:
   clean:

.github/workflows/main.yaml

@@ -53,12 +53,6 @@ jobs:
       - name: Build example
         run: (cd example-project/; make)
 
-      - name: Prepare publish
-        run: |
-          sed --in-place 's/^# format/format/g' pyproject.toml
-          cat pyproject.toml
-        if: |
-          env.HAS_SECRETS == 'HAS_SECRETS'
       - name: Publish
         run: c2cciutils-publish
         if: |

c2cciutils/publish.py

@@ -297,6 +297,7 @@ def pip(
                         subprocess.run([f"{venv}/bin/pip", "install", "poetry"], check=True)
                         for requirement in pyproject.get("build-system", {}).get("requires", []):
                             print(f"Install requirement {requirement}")
+                            sys.stdout.flush()
                             subprocess.run([f"{venv}/bin/pip", "install", requirement], check=True)
                         subprocess.run(["poetry", "--version"], check=True)
                         subprocess.run([f"{venv}/bin/poetry", "build"], cwd=cwd, env=env, check=True)

c2cciutils/scripts/clean.py

@@ -85,7 +85,9 @@ def main() -> None:
     ).json()["token"]
 
     with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as event_file:
-        ref = json.loads(event_file.read())["ref"]
+        event = json.loads(event_file.read())
+        print(event)
+        ref = event["ref"]
 
     ref = ref.replace("/", "_")
 

c2cciutils/scripts/publish.py

@@ -92,6 +92,8 @@ def main() -> None:
         print("ERROR: you specified more than one of the arguments --version, --branch or --tag")
         sys.exit(1)
 
+    version_type = args.type
+
     tag_match = c2cciutils.match(
         ref,
         c2cciutils.compile_re(config["version"].get("tag_to_version_re", []), "refs/tags/"),
@@ -104,8 +106,9 @@ def main() -> None:
         ref_match = re.match(r"refs/pull/(.*)/merge", ref)
         if ref_match is not None:
             branch_match = (ref_match, {}, ref)
+            if version_type is None:
+                version_type = "feature_branch"
 
-    version_type = args.type
     if args.version is not None:
         version = args.version
     elif args.branch is not None: