From fe16e4d9c4d645b69c8ce005cfeeb675b2745bfc Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Thu, 19 Mar 2020 21:16:14 -0700 Subject: [PATCH] Build and About page (#64) * Adding credits txt * Switch up build number --- .github/workflows/release.yml | 5 ++++- Config/Config.xcconfig | 3 ++- Secretive.xcodeproj/project.pbxproj | 4 ++++ Secretive/Credits.rtf | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 Secretive/Credits.rtf diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4fa736b..be94bad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,9 +45,12 @@ jobs: - name: Update Build Number env: TAG_NAME: ${{ github.ref }} + RUN_ID: ${{ github.run_id }} run: | export CLEAN_TAG=$(echo $TAG_NAME | sed -e 's/refs\/tags\/v//') - sed -i '' -e "s/CI_VERSION = 0.0.0/CI_VERSION = $CLEAN_TAG/g" Config/Config.xcconfig + sed -i '' -e "s/GITHUB_CI_VERSION/$CLEAN_TAG/g" Config/Config.xcconfig + sed -i '' -e "s/GITHUB_BUILD_NUMBER/1.$RUN_ID/g" Config/Config.xcconfig + sed -i '' -e "s/GITHUB_BUILD_URL/https:\/\/github.com\/maxgoedjen\/secretive\/actions\/runs\/$RUN_ID/g" Secretive/Credits.rtf - name: Build run: xcrun xcodebuild -project Secretive.xcodeproj -scheme Secretive -configuration Release -archivePath Archive.xcarchive archive - name: Create ZIPs diff --git a/Config/Config.xcconfig b/Config/Config.xcconfig index b265fbc..9c18c35 100644 --- a/Config/Config.xcconfig +++ b/Config/Config.xcconfig @@ -1 +1,2 @@ -CI_VERSION = 0.0.0 \ No newline at end of file +CI_VERSION = GITHUB_CI_VERSION +CI_BUILD_NUMBER = GITHUB_BUILD_NUMBER diff --git a/Secretive.xcodeproj/project.pbxproj b/Secretive.xcodeproj/project.pbxproj index e9c8698..2c4890f 100644 --- a/Secretive.xcodeproj/project.pbxproj +++ b/Secretive.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ 50617DCE23FCECFA0099B055 /* SecureEnclaveSecret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50617DCD23FCECFA0099B055 /* SecureEnclaveSecret.swift */; }; 50617DD023FCED2C0099B055 /* SecureEnclave.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50617DCF23FCED2C0099B055 /* SecureEnclave.swift */; }; 50617DD223FCEFA90099B055 /* PreviewStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50617DD123FCEFA90099B055 /* PreviewStore.swift */; }; + 506772C72424784600034DED /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 506772C62424784600034DED /* Credits.rtf */; }; 5068389E241471CD00F55094 /* SecretStoreList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5068389D241471CD00F55094 /* SecretStoreList.swift */; }; 506838A12415EA5600F55094 /* AnySecret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 506838A02415EA5600F55094 /* AnySecret.swift */; }; 506838A32415EA5D00F55094 /* AnySecretStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 506838A22415EA5D00F55094 /* AnySecretStore.swift */; }; @@ -199,6 +200,7 @@ 50617DCD23FCECFA0099B055 /* SecureEnclaveSecret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureEnclaveSecret.swift; sourceTree = ""; }; 50617DCF23FCED2C0099B055 /* SecureEnclave.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureEnclave.swift; sourceTree = ""; }; 50617DD123FCEFA90099B055 /* PreviewStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewStore.swift; sourceTree = ""; }; + 506772C62424784600034DED /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 5068389D241471CD00F55094 /* SecretStoreList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretStoreList.swift; sourceTree = ""; }; 506838A02415EA5600F55094 /* AnySecret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnySecret.swift; sourceTree = ""; }; 506838A22415EA5D00F55094 /* AnySecretStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnySecretStore.swift; sourceTree = ""; }; @@ -337,6 +339,7 @@ 50617D8B23FCE48E0099B055 /* Main.storyboard */, 50617D8E23FCE48E0099B055 /* Info.plist */, 50617D8F23FCE48E0099B055 /* Secretive.entitlements */, + 506772C62424784600034DED /* Credits.rtf */, 50617D8823FCE48E0099B055 /* Preview Content */, ); path = Secretive; @@ -741,6 +744,7 @@ 50617D8D23FCE48E0099B055 /* Main.storyboard in Resources */, 50617D8A23FCE48E0099B055 /* Preview Assets.xcassets in Resources */, 50617D8723FCE48E0099B055 /* Assets.xcassets in Resources */, + 506772C72424784600034DED /* Credits.rtf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Secretive/Credits.rtf b/Secretive/Credits.rtf new file mode 100644 index 0000000..57fff70 --- /dev/null +++ b/Secretive/Credits.rtf @@ -0,0 +1,23 @@ +{\rtf1\ansi\ansicpg1252\cocoartf2511 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\margl1440\margr1440\vieww9000\viewh8400\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6119\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +{\field{\*\fldinst{HYPERLINK "https://github.com/maxgoedjen/secretive"}}{\fldrslt +\f0\fs24 \cf0 https://github.com/maxgoedjen/secretive}} +\f0\fs24 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +\cf0 \ +GITHUB_BUILD_URL\ +\ +Special Thanks To:\ +https://github.com/bdash\ +https://github.com/danielctull\ +https://github.com/davedelong\ +https://github.com/esttorhe\ +https://github.com/joeblau\ +https://github.com/marksands\ +https://github.com/mergesort\ +https://github.com/phillco\ +https://github.com/zackdotcomputer} \ No newline at end of file