Skip to content

Commit a1bde56

Browse files
committed
Repair mayhem4api workrun
- Use inplace config so debug packages are available - Fix Mayhem syntax
1 parent 45b7aa6 commit a1bde56

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

.github/workflows/mayhem-api.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ jobs:
4141
run-args: |
4242
--config
4343
.github/workflowscripts/mapi.config
44-
--ignore-endpoint ".*strict=true.*"
45-
--ignore-endpoint ".*strict=True.*"
44+
--ignore-endpoint
45+
".*strict=true.*"
46+
--ignore-endpoint
47+
".*strict=True.*"
4648
4749
- name: Mayhem for API (For application role)
4850
uses: ForAllSecure/mapi-action@v1
@@ -60,8 +62,10 @@ jobs:
6062
.github/workflowscripts/mapi.config
6163
--basic-auth
6264
admin:password
63-
--ignore-endpoint ".*strict=true.*"
64-
--ignore-endpoint ".*strict=True.*"
65+
--ignore-endpoint
66+
".*strict=true.*"
67+
--ignore-endpoint
68+
".*strict=True.*"
6569
6670
- name: Upload SARIF file
6771
uses: github/codeql-action/upload-sarif@v2

.github/workflowscripts/baseinstall.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,15 @@ echo "password" > ./etc/initial_admin_password.secret
5353
section_end
5454

5555
section_start "Install domserver"
56-
make configure
57-
./configure --with-baseurl='https://localhost/domjudge/' --enable-doc-build=no --prefix="/opt/domjudge"
58-
59-
make domserver
60-
sudo make install-domserver
56+
make inplace-conf CONFIGURE_FLAGS='--disable-doc-build --with-baseurl="https://localhost/domjudge/" --enable-doc-build=no'
57+
sudo make inplace-install
58+
sudo make inplace-postinstall-permissions
6159
section_end
6260

6361
section_start "Explicit start mysql + install DB"
6462
sudo /etc/init.d/mysql start
6563

66-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install
64+
sudo /home/runner/work/domjudge/domjudge/bin/dj_setup_database -uroot -proot install
6765
section_end
6866

6967
section_start "Setup user"
@@ -86,10 +84,10 @@ fi
8684
section_end
8785

8886
section_start "Setup webserver"
89-
sudo cp /opt/domjudge/domserver/etc/domjudge-fpm.conf /etc/php/7.4/fpm/pool.d/domjudge.conf
87+
sudo cp /home/runner/work/domjudge/domjudge/etc/domjudge-fpm.conf /etc/php/7.4/fpm/pool.d/domjudge.conf
9088

9189
sudo rm -f /etc/nginx/sites-enabled/*
92-
sudo cp /opt/domjudge/domserver/etc/nginx-conf /etc/nginx/sites-enabled/domjudge
90+
sudo cp /home/runner/work/domjudge/domjudge/etc/nginx-conf /etc/nginx/sites-enabled/domjudge
9391

9492
openssl req -nodes -new -x509 -keyout /tmp/server.key -out /tmp/server.crt -subj "/C=NL/ST=Noord-Holland/L=Amsterdam/O=TestingForPR/CN=localhost"
9593
# shellcheck disable=SC2002
@@ -98,7 +96,7 @@ sudo nginx -t
9896
section_end
9997

10098
section_start "Enable stacktrace in API response"
101-
echo "APP_ENV=dev" > /opt/domjudge/domserver/webapp/.env.local
99+
echo "APP_ENV=dev" | sudo tee /home/runner/work/domjudge/domjudge/webapp/.env.local
102100
section_end
103101

104102
section_start "Show webserver is up"

.github/workflowscripts/nginx_extra

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ server {
55
ssl_session_timeout 5m;
66
ssl_prefer_server_ciphers on;
77
add_header Strict-Transport-Security max-age=31556952;
8-
include /opt/domjudge/domserver/etc/nginx-conf-inner;
8+
include /home/runner/work/domjudge/domjudge/etc/nginx-conf-inner;
99
}

0 commit comments

Comments
 (0)