@@ -7,7 +7,6 @@ export HTDOCS="$HOME/htdocs"
7
7
export GITHUB_BRANCH=${GITHUB_REF##* heads/ }
8
8
export CI_SCRIPT_OPTIONS=" ci_script_options"
9
9
10
-
11
10
function init_checks() {
12
11
13
12
# Check if branch is available
@@ -18,7 +17,7 @@ function init_checks() {
18
17
19
18
# Check for SSH key if jump host is defined
20
19
if [[ ! -z " $JUMPHOST_SERVER " ]]; then
21
-
20
+
22
21
if [[ -z " $SSH_PRIVATE_KEY " ]]; then
23
22
echo " Jump host configuration does not work with vault ssh signing."
24
23
echo " SSH_PRIVATE_KEY secret needs to be added."
@@ -45,9 +44,9 @@ function check_branch_in_hosts_file() {
45
44
46
45
match=0
47
46
for branch in $( cat " $hosts_file " | shyaml keys) ; do
48
- [[ " $GITHUB_REF " = " refs/heads/$branch " ]] && \
49
- echo " $GITHUB_REF matches refs/heads/$branch " && \
50
- match=1
47
+ [[ " $GITHUB_REF " = " refs/heads/$branch " ]] &&
48
+ echo " $GITHUB_REF matches refs/heads/$branch " &&
49
+ match=1
51
50
done
52
51
53
52
# Exit neutral if no match found
@@ -60,14 +59,14 @@ function check_branch_in_hosts_file() {
60
59
function setup_private_key() {
61
60
62
61
if [[ -n " $SSH_PRIVATE_KEY " ]]; then
63
- echo " $SSH_PRIVATE_KEY " | tr -d ' \r' > " $SSH_DIR /id_rsa"
64
- chmod 600 " $SSH_DIR /id_rsa"
65
- eval " $( ssh-agent -s) "
66
- ssh-add " $SSH_DIR /id_rsa"
62
+ echo " $SSH_PRIVATE_KEY " | tr -d ' \r' > " $SSH_DIR /id_rsa"
63
+ chmod 600 " $SSH_DIR /id_rsa"
64
+ eval " $( ssh-agent -s) "
65
+ ssh-add " $SSH_DIR /id_rsa"
67
66
68
- if [[ -n " $JUMPHOST_SERVER " ]]; then
69
- ssh-keyscan -H " $JUMPHOST_SERVER " >> /etc/ssh/known_hosts
70
- fi
67
+ if [[ -n " $JUMPHOST_SERVER " ]]; then
68
+ ssh-keyscan -H " $JUMPHOST_SERVER " >> /etc/ssh/known_hosts
69
+ fi
71
70
else
72
71
# Generate a key-pair
73
72
ssh-keygen -t rsa -b 4096 -C " GH-actions-ssh-deploy-key" -f " $HOME /.ssh/id_rsa" -N " "
@@ -79,28 +78,28 @@ function maybe_get_ssh_cert_from_vault() {
79
78
# Get signed key from vault
80
79
if [[ -n " $VAULT_GITHUB_TOKEN " ]]; then
81
80
unset VAULT_TOKEN
82
- vault login -method=github token=" $VAULT_GITHUB_TOKEN " > /dev/null
81
+ vault login -method=github token=" $VAULT_GITHUB_TOKEN " > /dev/null
83
82
fi
84
83
85
84
if [[ -n " $VAULT_ADDR " ]]; then
86
- vault write -field=signed_key ssh-client-signer/sign/my-role public_key=@$HOME /.ssh/id_rsa.pub > $HOME /.ssh/signed-cert.pub
85
+ vault write -field=signed_key ssh-client-signer/sign/my-role public_key=@$HOME /.ssh/id_rsa.pub > $HOME /.ssh/signed-cert.pub
87
86
fi
88
87
}
89
88
90
89
function configure_ssh_config() {
91
90
92
- if [[ -z " $JUMPHOST_SERVER " ]]; then
93
- # Create ssh config file. `~/.ssh/config` does not work.
94
- cat > /etc/ssh/ssh_config << EOL
91
+ if [[ -z " $JUMPHOST_SERVER " ]]; then
92
+ # Create ssh config file. `~/.ssh/config` does not work.
93
+ cat > /etc/ssh/ssh_config << EOL
95
94
Host $hostname
96
95
HostName $hostname
97
96
IdentityFile ${SSH_DIR} /signed-cert.pub
98
97
IdentityFile ${SSH_DIR} /id_rsa
99
98
User $ssh_user
100
99
EOL
101
- else
102
- # Create ssh config file. `~/.ssh/config` does not work.
103
- cat > /etc/ssh/ssh_config << EOL
100
+ else
101
+ # Create ssh config file. `~/.ssh/config` does not work.
102
+ cat > /etc/ssh/ssh_config << EOL
104
103
Host jumphost
105
104
HostName $JUMPHOST_SERVER
106
105
UserKnownHostsFile /etc/ssh/known_hosts
@@ -112,7 +111,7 @@ Host $hostname
112
111
UserKnownHostsFile /etc/ssh/known_hosts
113
112
User $ssh_user
114
113
EOL
115
- fi
114
+ fi
116
115
117
116
}
118
117
@@ -138,26 +137,26 @@ function maybe_install_submodules() {
138
137
# Check and update submodules if any
139
138
if [[ -f " $GITHUB_WORKSPACE /.gitmodules" ]]; then
140
139
# add github's public key
141
- echo " |1|qPmmP7LVZ7Qbpk7AylmkfR0FApQ=|WUy1WS3F4qcr3R5Sc728778goPw= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> /etc/ssh/known_hosts
140
+ echo " |1|qPmmP7LVZ7Qbpk7AylmkfR0FApQ=|WUy1WS3F4qcr3R5Sc728778goPw= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> /etc/ssh/known_hosts
142
141
143
142
identity_file=' '
144
143
if [[ -n " $SUBMODULE_DEPLOY_KEY " ]]; then
145
- echo " $SUBMODULE_DEPLOY_KEY " | tr -d ' \r' > " $SSH_DIR /submodule_deploy_key"
144
+ echo " $SUBMODULE_DEPLOY_KEY " | tr -d ' \r' > " $SSH_DIR /submodule_deploy_key"
146
145
chmod 600 " $SSH_DIR /submodule_deploy_key"
147
146
ssh-add " $SSH_DIR /submodule_deploy_key"
148
147
identity_file=" IdentityFile ${SSH_DIR} /submodule_deploy_key"
149
148
fi
150
149
151
- # Setup config file for proper git cloning
152
- cat >> /etc/ssh/ssh_config << EOL
150
+ # Setup config file for proper git cloning
151
+ cat >> /etc/ssh/ssh_config << EOL
153
152
Host github.com
154
153
HostName github.com
155
154
User git
156
155
UserKnownHostsFile /etc/ssh/known_hosts
157
156
${identity_file}
158
157
EOL
159
- git submodule update --init --recursive
160
- fi
158
+ git submodule update --init --recursive
159
+ fi
161
160
}
162
161
163
162
function setup_wordpress_files() {
@@ -166,7 +165,7 @@ function setup_wordpress_files() {
166
165
cd " $HTDOCS "
167
166
export build_root=" $( pwd) "
168
167
169
- hosts_wp_version=$( cat " $hosts_file " | shyaml get-value " $GITHUB_BRANCH .WP_VERSION" 2> /dev/null)
168
+ hosts_wp_version=$( cat " $hosts_file " | shyaml get-value " $GITHUB_BRANCH .WP_VERSION" 2> /dev/null)
170
169
171
170
# Check if WP_VERSION is already defined in hosts.yml
172
171
# Priority: 1. hosts.yml, 2. workflow file, else use latest
@@ -177,9 +176,9 @@ function setup_wordpress_files() {
177
176
fi
178
177
179
178
if [[ " $WP_MINOR_UPDATE " == " true" ]] && [[ " $WP_VERSION " != " latest" ]]; then
180
- LATEST_MINOR_VERSION=$( \
181
- curl -s " https://api.wordpress.org/core/version-check/1.7/?version=$WP_VERSION " | \
182
- jq -r ' [.offers[]|select(.response=="autoupdate")][-1].version'
179
+ LATEST_MINOR_VERSION=$(
180
+ curl -s " https://api.wordpress.org/core/version-check/1.7/?version=$WP_VERSION " |
181
+ jq -r ' [.offers[]|select(.response=="autoupdate")][-1].version'
183
182
)
184
183
MAJOR_DOT_MINOR=$( echo " $WP_VERSION " | cut -c1-3)
185
184
if [[ " $LATEST_MINOR_VERSION " == " $MAJOR_DOT_MINOR " * ]]; then
@@ -196,11 +195,11 @@ function setup_wordpress_files() {
196
195
197
196
# Include webroot-files in htdocs if they exists
198
197
if [[ -d " $GITHUB_WORKSPACE /webroot-files" ]]; then
199
- rsync -av " $GITHUB_WORKSPACE /webroot-files/" " $HTDOCS /" > /dev/null
198
+ rsync -av " $GITHUB_WORKSPACE /webroot-files/" " $HTDOCS /" > /dev/null
200
199
rm -rf " $GITHUB_WORKSPACE /webroot-files/"
201
200
fi
202
201
203
- rsync -av " $GITHUB_WORKSPACE /" " $HTDOCS /wp-content/" > /dev/null
202
+ rsync -av " $GITHUB_WORKSPACE /" " $HTDOCS /wp-content/" > /dev/null
204
203
205
204
# Remove uploads directory
206
205
cd " $HTDOCS /wp-content/"
0 commit comments