From ccf274610f612f8c62570f606685d31b50221b95 Mon Sep 17 00:00:00 2001 From: b123400 Date: Thu, 29 Jun 2023 12:19:06 +0900 Subject: [PATCH 1/2] Try to build on Github Action --- .github/workflows/build.yml | 60 ++++++++++++++++++++++++ AmiKo.xcodeproj/project.pbxproj | 11 +---- HINClient/MLHINClientCredential.sample.h | 4 +- Medidata/MedidataCredential.sample.h | 2 +- 4 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9edd719 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,60 @@ +name: Build + +on: + push: + branches: #[ "master" ] + - '*' + # pull_request: + # branches: [ "master" ] + +jobs: + build: + name: Build and analyse default scheme using xcodebuild command + runs-on: macos-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup credentails + env: # Or as an environment variable + HIN_CLIENT_ID: ${{ secrets.HIN_CLIENT_ID }} + HIN_CLIENT_SECRET: ${{ secrets.HIN_CLIENT_SECRET }} + MEDIDATA_CLIENT_AUTHORIZATION: ${{ secrets.MEDIDATA_CLIENT_AUTHORIZATION }} + MEDIDATA_CLIENT_CLIENT_ID_PREFIX: ${{ secrets.MEDIDATA_CLIENT_CLIENT_ID_PREFIX }} + run: | + sed "s/YOUR_HIN_CLIENT_ID/$HIN_CLIENT_ID/;s/YOUR_HIN_CLIENT_SECRET/$HIN_CLIENT_SECRET/" ./HINClient/MLHINClientCredential.sample.h > ./HINClient/MLHINClientCredential.h + sed "s/YOUR_MEDIDATA_CLIENT_AUTHORIZATION/$MEDIDATA_CLIENT_AUTHORIZATION/;s/1000000000/$MEDIDATA_CLIENT_CLIENT_ID_PREFIX/" ./Medidata/MedidataCredential.sample.h > ./Medidata/MedidataCredential.h + - name: Download databases + run: | + cd AmiKoOSX + curl -o amiko_report_de.html http://pillbox.oddb.org/amiko_report_de.html + curl -o amiko_db_full_idx_de.zip http://pillbox.oddb.org/amiko_db_full_idx_de.zip + curl -o amiko_frequency_de.db.zip http://pillbox.oddb.org/amiko_frequency_de.db.zip + curl -o drug_interactions_csv_de.zip http://pillbox.oddb.org/drug_interactions_csv_de.zip + curl -o amiko_report_fr.html http://pillbox.oddb.org/amiko_report_fr.html + curl -o amiko_db_full_idx_fr.zip http://pillbox.oddb.org/amiko_db_full_idx_fr.zip + curl -o amiko_frequency_fr.db.zip http://pillbox.oddb.org/amiko_frequency_fr.db.zip + curl -o drug_interactions_csv_fr.zip http://pillbox.oddb.org/drug_interactions_csv_fr.zip + unzip amiko_db_full_idx_de.zip + unzip amiko_frequency_de.db.zip + unzip drug_interactions_csv_de.zip + unzip amiko_db_full_idx_fr.zip + unzip amiko_frequency_fr.db.zip + unzip drug_interactions_csv_fr.zip + rm amiko_db_full_idx_de.zip amiko_frequency_de.db.zip drug_interactions_csv_de.zip amiko_db_full_idx_fr.zip amiko_frequency_fr.db.zip drug_interactions_csv_fr.zip + - name: Build + run: | + mkdir archive + xcodebuild clean build archive -allowProvisioningUpdates -project AmiKo.xcodeproj -scheme AmiKo -archivePath ./archive/amiko-archive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + xcodebuild clean build archive -allowProvisioningUpdates -project AmiKo.xcodeproj -scheme CoMed -archivePath ./archive/comed-archive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + ls archive + - uses: actions/upload-artifact@v3 + with: + name: amiko-artifact + path: ./archive/amiko-archive.xcarchive + retention-days: 30 + - uses: actions/upload-artifact@v3 + with: + name: comed-artifact + path: ./archive/comed-archive.xcarchive + retention-days: 30 diff --git a/AmiKo.xcodeproj/project.pbxproj b/AmiKo.xcodeproj/project.pbxproj index 023e513..8d15fa0 100644 --- a/AmiKo.xcodeproj/project.pbxproj +++ b/AmiKo.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -145,8 +145,6 @@ D5AE31881B372093006BC60E /* desitin_icon_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = D5AE31841B372085006BC60E /* desitin_icon_512x512.png */; }; D5B0105C1927C451007BE838 /* interactions_css.css in Resources */ = {isa = PBXBuildFile; fileRef = D5B0105B1927C451007BE838 /* interactions_css.css */; }; D5B0105D1927C451007BE838 /* interactions_css.css in Resources */ = {isa = PBXBuildFile; fileRef = D5B0105B1927C451007BE838 /* interactions_css.css */; }; - D5B010611927C472007BE838 /* interactions_callbacks.js in Sources */ = {isa = PBXBuildFile; fileRef = D5B010601927C472007BE838 /* interactions_callbacks.js */; }; - D5B010621927C472007BE838 /* interactions_callbacks.js in Sources */ = {isa = PBXBuildFile; fileRef = D5B010601927C472007BE838 /* interactions_callbacks.js */; }; D5B6F96C192BE2B100495873 /* drug_interactions_csv_de.csv in Resources */ = {isa = PBXBuildFile; fileRef = D5B6F96B192BE2B100495873 /* drug_interactions_csv_de.csv */; }; D5B6F970193136A400495873 /* interactions_callbacks.js in Resources */ = {isa = PBXBuildFile; fileRef = D5B010601927C472007BE838 /* interactions_callbacks.js */; }; D5BACBFA1EBB1D2C001812FB /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = D5BACBF31EBB1D2C001812FB /* WebViewJavascriptBridge.m */; }; @@ -189,7 +187,6 @@ D5E91B8917E5E8E400B66B27 /* MLAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC69317C912FF00EBEF39 /* MLAppDelegate.m */; }; D5E91B8A17E5E8E400B66B27 /* MLMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6A217C913B100EBEF39 /* MLMainWindowController.m */; }; D5E91B8B17E5E8E400B66B27 /* MLSQLiteDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6AC17C9202600EBEF39 /* MLSQLiteDatabase.m */; }; - D5E91B8C17E5E8E400B66B27 /* MLSearchWebView.js in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B017C9205E00EBEF39 /* MLSearchWebView.js */; }; D5E91B8D17E5E8E400B66B27 /* MLDBAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B517C9206800EBEF39 /* MLDBAdapter.m */; }; D5E91B8E17E5E8E400B66B27 /* MLMedication.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B717C9206800EBEF39 /* MLMedication.m */; }; D5E91B8F17E5E8E400B66B27 /* MLDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6BB17C9207200EBEF39 /* MLDataStore.m */; }; @@ -212,7 +209,6 @@ D5E91BB817E5E8E800B66B27 /* MLAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC69317C912FF00EBEF39 /* MLAppDelegate.m */; }; D5E91BB917E5E8E800B66B27 /* MLMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6A217C913B100EBEF39 /* MLMainWindowController.m */; }; D5E91BBA17E5E8E800B66B27 /* MLSQLiteDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6AC17C9202600EBEF39 /* MLSQLiteDatabase.m */; }; - D5E91BBB17E5E8E800B66B27 /* MLSearchWebView.js in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B017C9205E00EBEF39 /* MLSearchWebView.js */; }; D5E91BBC17E5E8E800B66B27 /* MLDBAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B517C9206800EBEF39 /* MLDBAdapter.m */; }; D5E91BBD17E5E8E800B66B27 /* MLMedication.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6B717C9206800EBEF39 /* MLMedication.m */; }; D5E91BBE17E5E8E800B66B27 /* MLDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EBC6BB17C9207200EBEF39 /* MLDataStore.m */; }; @@ -1297,6 +1293,7 @@ /* Begin PBXShellScriptBuildPhase section */ CFECF67424D1D8CD00CD6E09 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 12; files = ( ); @@ -1341,11 +1338,9 @@ D58685551F47049D00A250A4 /* MLPrescriptionsAdapter.m in Sources */, D538779A1AA386AC00AEFDB4 /* SHCWebView.m in Sources */, FA63296D20A088CC002DC9E2 /* MLPrescriptionTableView.m in Sources */, - D5B010611927C472007BE838 /* interactions_callbacks.js in Sources */, D5E91B8B17E5E8E400B66B27 /* MLSQLiteDatabase.m in Sources */, CFF3D9EC26E1259B003B74C2 /* MedidataClientUploadStatus.m in Sources */, D545C8E71898527C00491511 /* zip.c in Sources */, - D5E91B8C17E5E8E400B66B27 /* MLSearchWebView.js in Sources */, D5C6440D1EB32F5300438E6F /* MLInteractionsHtmlView.m in Sources */, D5C5C5071F03AE2E00DF851F /* MLPatient.m in Sources */, D5E91B8D17E5E8E400B66B27 /* MLDBAdapter.m in Sources */, @@ -1434,13 +1429,11 @@ CF13F89926ECB2510060FB46 /* MedidataInvoiceResponseLocalRow.m in Sources */, D545C90C18A4286B00491511 /* MLCustomWebView.m in Sources */, D538779B1AA386AC00AEFDB4 /* SHCWebView.m in Sources */, - D5B010621927C472007BE838 /* interactions_callbacks.js in Sources */, CF3B87472A4AECA100D7D894 /* MLHINClient.m in Sources */, D5E91BBA17E5E8E800B66B27 /* MLSQLiteDatabase.m in Sources */, D545C8FC18A2CE0D00491511 /* zip.c in Sources */, CFF3D9ED26E1259B003B74C2 /* MedidataClientUploadStatus.m in Sources */, D53973CE1FA37B9200D7E444 /* MLOperator.m in Sources */, - D5E91BBB17E5E8E800B66B27 /* MLSearchWebView.js in Sources */, D5C6440E1EB32F5300438E6F /* MLInteractionsHtmlView.m in Sources */, CFDFC48A26CA905C00EDD182 /* MLMedidataResponsesWindowController.m in Sources */, CF3B87542A4AF92300D7D894 /* MLHINOAuthWindowController.m in Sources */, diff --git a/HINClient/MLHINClientCredential.sample.h b/HINClient/MLHINClientCredential.sample.h index 148a2a4..a5eb4a2 100644 --- a/HINClient/MLHINClientCredential.sample.h +++ b/HINClient/MLHINClientCredential.sample.h @@ -9,7 +9,7 @@ #ifndef MLHINClientCredential_h #define MLHINClientCredential_h -#define HIN_CLIENT_ID @"xxxxxxxx" -#define HIN_CLIENT_SECRET @"xxxxxxxxxx" +#define HIN_CLIENT_ID @"YOUR_HIN_CLIENT_ID" +#define HIN_CLIENT_SECRET @"YOUR_HIN_CLIENT_SECRET" #endif /* MLHINClientCredential_h */ diff --git a/Medidata/MedidataCredential.sample.h b/Medidata/MedidataCredential.sample.h index 1c3ab9d..4e39013 100644 --- a/Medidata/MedidataCredential.sample.h +++ b/Medidata/MedidataCredential.sample.h @@ -9,7 +9,7 @@ #ifndef MedidataCredential_h #define MedidataCredential_h -#define MEDIDATA_CLIENT_AUTHORIZATION @"XXXXXXXXXXXX" +#define MEDIDATA_CLIENT_AUTHORIZATION @"YOUR_MEDIDATA_CLIENT_AUTHORIZATION" #define MEDIDATA_CLIENT_CLIENT_ID_PREFIX @"1000000000" #endif /* MedidataCredential_h */ From 15ab553db70cbee7ea62a78d5d023eadec661a2c Mon Sep 17 00:00:00 2001 From: b123400 Date: Thu, 29 Jun 2023 17:04:10 +0900 Subject: [PATCH 2/2] Add steps for PR --- .github/workflows/build.yml | 8 +++----- .github/workflows/pr.yml | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9edd719..4943539 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,14 +2,12 @@ name: Build on: push: - branches: #[ "master" ] - - '*' - # pull_request: - # branches: [ "master" ] + branches: + - master jobs: build: - name: Build and analyse default scheme using xcodebuild command + name: Archive runs-on: macos-latest steps: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000..70b320d --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,41 @@ +name: Build + +on: + pull_request: + branches: + - '*' + +jobs: + build: + name: Build + runs-on: macos-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup credentails + run: | + cp ./HINClient/MLHINClientCredential.sample.h ./HINClient/MLHINClientCredential.h + cp ./Medidata/MedidataCredential.sample.h ./Medidata/MedidataCredential.h + - name: Download databases + run: | + cd AmiKoOSX + curl -o amiko_report_de.html http://pillbox.oddb.org/amiko_report_de.html + curl -o amiko_db_full_idx_de.zip http://pillbox.oddb.org/amiko_db_full_idx_de.zip + curl -o amiko_frequency_de.db.zip http://pillbox.oddb.org/amiko_frequency_de.db.zip + curl -o drug_interactions_csv_de.zip http://pillbox.oddb.org/drug_interactions_csv_de.zip + curl -o amiko_report_fr.html http://pillbox.oddb.org/amiko_report_fr.html + curl -o amiko_db_full_idx_fr.zip http://pillbox.oddb.org/amiko_db_full_idx_fr.zip + curl -o amiko_frequency_fr.db.zip http://pillbox.oddb.org/amiko_frequency_fr.db.zip + curl -o drug_interactions_csv_fr.zip http://pillbox.oddb.org/drug_interactions_csv_fr.zip + unzip amiko_db_full_idx_de.zip + unzip amiko_frequency_de.db.zip + unzip drug_interactions_csv_de.zip + unzip amiko_db_full_idx_fr.zip + unzip amiko_frequency_fr.db.zip + unzip drug_interactions_csv_fr.zip + rm amiko_db_full_idx_de.zip amiko_frequency_de.db.zip drug_interactions_csv_de.zip amiko_db_full_idx_fr.zip amiko_frequency_fr.db.zip drug_interactions_csv_fr.zip + - name: Build + run: | + xcodebuild clean build -allowProvisioningUpdates -project AmiKo.xcodeproj -scheme AmiKo CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + xcodebuild clean build -allowProvisioningUpdates -project AmiKo.xcodeproj -scheme CoMed CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO