Skip to content

Commit bfa69a3

Browse files
committed
Remove checks for workflow dispatch on deploy to S3 for all OS
1 parent d4aae02 commit bfa69a3

3 files changed

Lines changed: 10 additions & 27 deletions

File tree

.github/workflows/linux_build_deploy.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
name: Build GUI for Linux
22

33
on:
4-
workflow_dispatch:
5-
inputs:
6-
logLevel:
7-
description: 'Log level'
8-
required: false
9-
default: 'warning'
10-
tags:
11-
description: 'Build and deploy for specific tags'
4+
workflow_dispatch:
125
pull_request:
136
branches: [master, development]
147
push:
@@ -74,14 +67,12 @@ jobs:
7467
GUI_VERSION_STRING=`cat temp/versionstring.txt`
7568
7669
- name: Configure AWS credentials from Production account
77-
if: github.event_name == 'workflow_dispatch'
7870
uses: aws-actions/configure-aws-credentials@v2
7971
with:
8072
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
8173
aws-region: ${{ env.AWS_REGION }}
8274

8375
- name: Store DMG on AWS
84-
if: github.event_name == 'workflow_dispatch'
8576
run: |
8677
cd $GITHUB_WORKSPACE
8778
ls

.github/workflows/mac_build_deploy.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,18 @@ jobs:
6767
6868
- name: Save Encrypted Certificate to File
6969
run: |
70-
echo $MAC_CERTIFICATE_ENCRYPTED > $GITHUB_WORKSPACE/release_script/mac_only/Certificates_2023.p12.enc
70+
echo $MAC_CERTIFICATE_ENCRYPTED | base64 --decode > $GITHUB_WORKSPACE/release_script/mac_only/Certificates_2023.p12.enc
7171
env:
7272
MAC_CERTIFICATE_ENCRYPTED: ${{ secrets.MAC_CERTIFICATE_ENCRYPTED }}
7373

7474
- name: Decrypt Certificate
75-
if: github.event_name == 'workflow_dispatch'
7675
run: |
7776
openssl version
7877
openssl enc -aes-256-cbc -a -d -pbkdf2 -in $GITHUB_WORKSPACE/release_script/mac_only/Certificates_2023.p12.enc -out $GITHUB_WORKSPACE/release_script/mac_only/Certificates.p12 -k "$OPENSSL_CERT_K"
79-
openssl base64 -in $GITHUB_WORKSPACE/release_script/mac_only/Certificates.p12 -out $GITHUB_WORKSPACE/release_script/mac_only/Certificates.txt
8078
env:
8179
OPENSSL_CERT_K: ${{ secrets.OPENSSL_CERT_K }}
8280

83-
- name: Add OSX Signing Certificate
84-
if: github.event_name == 'workflow_dispatch'
81+
- name: Add OSX Signing Certificate to Keychain
8582
uses: apple-actions/import-codesign-certs@v2
8683
with:
8784
p12-filepath: ${{ github.workspace }}/release_script/mac_only/Certificates.p12
@@ -97,14 +94,12 @@ jobs:
9794
GUI_VERSION_STRING=`cat temp/versionstring.txt`
9895
9996
- name: Configure AWS credentials from Production account
100-
if: github.event_name == 'workflow_dispatch'
10197
uses: aws-actions/configure-aws-credentials@v2
10298
with:
10399
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
104100
aws-region: ${{ env.AWS_REGION }}
105101

106-
- name: Store DMG on AWS
107-
if: github.event_name == 'workflow_dispatch'
102+
- name: Store DMG on AWS S3
108103
run: |
109104
cd $GITHUB_WORKSPACE
110105
ls

.github/workflows/windows_build_deploy.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ env:
1717
jobs:
1818
build:
1919
name: Test Build for Windows
20-
if: github.event_name != 'workflow_dispatch'
2120
runs-on: windows-2019
2221

2322
steps:
@@ -79,7 +78,7 @@ jobs:
7978
shell: cmd
8079

8180
- name: Build without Signing
82-
if: github.event_name != 'workflow_dispatch'
81+
if: ${{ true }}
8382
run: |
8483
echo %cd%
8584
ls
@@ -89,7 +88,7 @@ jobs:
8988
shell: cmd
9089

9190
- name: Decrypt pfx files
92-
if: github.event_name == 'workflow_dispatch'
91+
if: ${{ false }}
9392
run: |
9493
iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
9594
appveyor-tools\secure-file -decrypt $env:GITHUB_WORKSPACE\release_script\windows_only\0a2d0e9821bd184a1d969a1db3630c92-SHA2.pfx.enc -secret $env:PFX_SECRET -salt $env:PFX_SALT -out $env:GITHUB_WORKSPACE\release_script\windows_only\0a2d0e9821bd184a1d969a1db3630c92-SHA2.pfx
@@ -100,7 +99,7 @@ jobs:
10099
PFX_SALT: ${{ secrets.PFX_SALT }}
101100

102101
- name: Build and Sign
103-
if: github.event_name == 'workflow_dispatch'
102+
if: ${{ false }}
104103
run: |
105104
python %GITHUB_WORKSPACE%\release_script\make-release.py --no-prompts --pfx-password %PFX_PASS% --pfx-path %GITHUB_WORKSPACE%\release_script\windows_only\0a2d0e9821bd184a1d969a1db3630c92-SHA2.pfx
106105
env:
@@ -110,14 +109,12 @@ jobs:
110109
shell: cmd
111110

112111
- name: Configure AWS credentials from Production account
113-
if: github.event_name == 'workflow_dispatch'
114112
uses: aws-actions/configure-aws-credentials@v2
115113
with:
116114
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
117115
aws-region: ${{ env.AWS_REGION }}
118116

119117
- name: Store Build on AWS
120-
if: github.event_name == 'workflow_dispatch'
121118
run: |
122119
cd $GITHUB_WORKSPACE
123120
ls
@@ -127,6 +124,6 @@ jobs:
127124
echo $GUI_COMMIT_TIME
128125
echo $GUI_VERSION_STRING
129126
echo $CURRENT_BRANCH
130-
aws s3 rm s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_macosx.dmg"
131-
aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/${GUI_VERSION_STRING} --recursive --exclude "*" --include "openbcigui_*_macosx.dmg"
132-
aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_macosx.dmg"
127+
aws s3 rm s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip"
128+
aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/${GUI_VERSION_STRING} --recursive --exclude "*" --include "openbcigui_*_windows64.zip"
129+
aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip"

0 commit comments

Comments
 (0)