Solve conflict on case insensitive OSX

IfcOpenShell · Dec 22, 2024 · fce4550 · fce4550
1 parent 5746b8e
commit fce4550
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml
@@ -117,7 +117,7 @@ jobs:
 
       - name: Package .zip archives
         run: |
-          VERSION=`cat VERSION`
+          VERSION=`cat VVERSION`
           base=$(find $PWD/IfcOpenShell/build -maxdepth 4 -name install)
           mkdir -p $GITHUB_WORKSPACE/package
           cd $GITHUB_WORKSPACE/package

diff --git a/.github/workflows/build_rocky.yml b/.github/workflows/build_rocky.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Package .zip archives
         run: |
-          VERSION=`cat VERSION`
+          VERSION=`cat VVERSION`
           base=$GITHUB_WORKSPACE/IfcOpenShell/build/Linux/x86_64/install
           mkdir -p $GITHUB_WORKSPACE/package
           cd $GITHUB_WORKSPACE/package
@@ -100,7 +100,7 @@ jobs:
             mdm=`$python_root/bin/python3 --version | cut -c8- | cut -d. -f 1,2`
             cp -R $python_root/lib/python$mdm/site-packages/voxec .
             echo '[bdist_wheel]' > setup.cfg
-            echo 'python-tag = cp$mm' >> setup.cfg
+            echo 'python-tag = cp'$mm >> setup.cfg
 
             PATH=$python_root/bin:$PATH python3 -m build -w
             PATH=$python_root/bin:$PATH python3 -m auditwheel repair --plat manylinux_2_28_x86_64 dist/*.whl -w audited

diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -96,7 +96,7 @@ jobs:
 
       - name: Package .zip Archives
         run: |
-          $VERSION = Get-Content VERSION -Raw
+          $VERSION = Get-Content VVERSION -Raw
           $pyVersion = "${{ matrix.python }}"
           $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
           $OUTPUT_DIR = "$env:GITHUB_WORKSPACE\package"

diff --git a/VERSION b/VERSION
diff --git a/VVERSION b/VVERSION
@@ -0,0 +1 @@
+0.4.2