Merge branch 'master' into ban-message
This commit is contained in:
commit
eb53a0bc5d
20
.github/workflows/main.yml
vendored
20
.github/workflows/main.yml
vendored
@ -35,11 +35,12 @@ jobs:
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
# Runs a single command using the runners shell
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install qt5-qmake libqt5websockets5-dev g++ make
|
||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
with:
|
||||
packages: qt5-qmake libqt5websockets5-dev g++ make
|
||||
version: 1.0
|
||||
|
||||
# Runs a set of commands using the runners shell
|
||||
- name: qmake and build
|
||||
run: |
|
||||
@ -69,11 +70,12 @@ jobs:
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
# Runs a single command using the runners shell
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install qt5-qmake libqt5websockets5-dev g++ make
|
||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
with:
|
||||
packages: qt5-qmake libqt5websockets5-dev g++ make
|
||||
version: 1.0
|
||||
|
||||
# Runs a set of commands using the runners shell
|
||||
- name: qmake and build
|
||||
run: |
|
||||
@ -145,7 +147,7 @@ jobs:
|
||||
|
||||
- name: Deploy OpenSSL
|
||||
run: |
|
||||
curl https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1r.zip --output openssl-1.1.1.zip
|
||||
curl https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1t.zip --output openssl-1.1.1.zip
|
||||
tar -xf openssl-1.1.1.zip
|
||||
copy .\openssl-1.1\x64\bin\libcrypto-1_1-x64.dll .\bin\libcrypto-1_1-x64.dll
|
||||
copy .\openssl-1.1\x64\bin\libssl-1_1-x64.dll .\bin\libssl-1_1-x64.dll
|
||||
|
Loading…
Reference in New Issue
Block a user