Merge pull request #33 from flatironinstitute/main_merge_dev

New Github Actions
flatironinstitute · Jul 12, 2024 · f9a40ee · f9a40ee
2 parents ebcbfa2 + 86bb837
commit f9a40ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.github/workflows/main_merge_check.yml b/.github/workflows/main_merge_check.yml
@@ -0,0 +1,14 @@
+name: Check merging branch
+
+on:
+  pull_request:
+
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        if: github.base_ref == 'main' && github.head_ref != 'dev'
+        run: |
+          echo "ERROR: You can only merge to main from dev."
+          exit 1
diff --git a/src/cryo_challenge/__init__.py b/src/cryo_challenge/__init__.py
@@ -0,0 +1 @@
+from cryo_challenge.__about__ import __version__
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from cryo_challenge.__about__ import __version__