From 87bd83f932063538b2d47e0b8a4e3a11fa31949e Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:20:12 +0530 Subject: [PATCH 1/6] Allow content-type via Access-Control-Allow-Headers --- tinyphone/server.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tinyphone/server.h b/tinyphone/server.h index 045a926..8860f7b 100644 --- a/tinyphone/server.h +++ b/tinyphone/server.h @@ -68,7 +68,8 @@ struct TinyPhoneMiddleware if (req.method == crow::HTTPMethod::Options){ 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-Request-Headers", "Content-Type"); + res.add_header("Access-Control-Allow-Headers", "Content-Type"); res.end(); } } From 110e5123b070849c411abaca51d7dabbd18dee5a Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:21:58 +0530 Subject: [PATCH 2/6] Update server.h --- tinyphone/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tinyphone/server.h b/tinyphone/server.h index 8860f7b..8f57231 100644 --- a/tinyphone/server.h +++ b/tinyphone/server.h @@ -68,8 +68,8 @@ struct TinyPhoneMiddleware if (req.method == crow::HTTPMethod::Options){ 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.add_header("Access-Control-Request-Headers", "Content-Type"); + res.add_header("Access-Control-Allow-Headers", "Content-Type"); res.end(); } } From 8986b96dbd469d63b9fd06156dfaecbb2534b7cc Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:33:46 +0530 Subject: [PATCH 3/6] Bump version to 36.0.0.83 --- tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj | 4 ++-- tinyphone/stampver.inf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index cb9e7cf..604d85f 100644 --- 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/stampver.inf b/tinyphone/stampver.inf index 7a81809..48a42ef 100644 --- 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 From d558d46b954d885243f9b2178880aeae4c5cc519 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:51:20 +0530 Subject: [PATCH 4/6] Update docker.yaml --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e38b899..66ae45b 100644 --- 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: | From 3a935b16244b718975700588ec3d2ca2efb1635b Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:52:33 +0530 Subject: [PATCH 5/6] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c2fdd9..4c39a63 100644 --- 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 From 0acc130bcb32176e0116d8b8ee4103d6d419f49d Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Wed, 15 Feb 2023 13:54:46 +0530 Subject: [PATCH 6/6] Github actions eol changes --- .github/workflows/docker.yaml | 2 +- .github/workflows/main.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 66ae45b..033f2d8 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -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 index 4c39a63..85de1dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: |