Merge 0acc130 into 24f05d8

voiceip · Feb 15, 2023 · 12a6739 · 12a6739
2 parents 24f05d8 + 0acc130
commit 12a6739
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -37,7 +37,7 @@ jobs:
       continue-on-error: true
     - name: Set vars
       id: vars
-      run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
     - name: Build and Push tinyphone_base  to registry
       if: contains(steps.changed_files.outputs.modified, 'Dockerfile.base')
       run: |
@@ -53,7 +53,7 @@ jobs:
         cat ./distribution/docker/release.ps1 | docker run -v ${PWD}:"C:\Code\tinyphone" -i  ghcr.io/${{ github.repository_owner }}/tinyphone_base:vc2019
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tinyphone_installer
         path: |

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
         submodules: 'recursive'
 
     - name: Restore Boost Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache-boost
       with:
         path: C:\local\boost_1_74_0
@@ -49,7 +49,7 @@ jobs:
         Start-Process -Wait -FilePath "$env:TEMP\wix311.exe" "/install","/quiet","/norestart"
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1
     - name: Configure build for Windows MSVC
       uses: ilammy/msvc-dev-cmd@v1
       with:
@@ -61,7 +61,7 @@ jobs:
         .\distribution\docker\release.ps1 -ErrorAction Stop
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tinyphone.msi
         path: |
@@ -156,7 +156,7 @@ jobs:
         # codesign --force --sign "Apple Development" tinyphone.dmg 
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tinyphone.dmg
         path: |
@@ -222,7 +222,7 @@ jobs:
         make
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tinyphone.linux
         path: |

diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj
@@ -628,7 +628,7 @@
 					/usr/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 36.0.0.82;
+				MARKETING_VERSION = 36.0.0.83;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DBOOST_SYSTEM_DYN_LINK",
@@ -678,7 +678,7 @@
 					/usr/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 36.0.0.82;
+				MARKETING_VERSION = 36.0.0.83;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DBOOST_SYSTEM_DYN_LINK",

diff --git a/tinyphone/server.h b/tinyphone/server.h
@@ -69,6 +69,7 @@ struct TinyPhoneMiddleware
 			res.add_header("Access-Control-Allow-Origin", "*");
 			res.add_header("Access-Control-Allow-Methods", "OPTIONS, GET, HEAD, POST, PUT, DELETE");
 			res.add_header("Access-Control-Request-Headers", "Content-Type");
+			res.add_header("Access-Control-Allow-Headers", "Content-Type");
 			res.end();
 		}
 	}

diff --git a/tinyphone/stampver.inf b/tinyphone/stampver.inf
@@ -1,5 +1,5 @@
 ;StampVer information file
-FileVersion=36.0.0.82
-ProductVersion=36.0.0.82
+FileVersion=36.0.0.83
+ProductVersion=36.0.0.83
 FileFormat=%a.%b.%c
 ProductFormat=%a.%b.%c