Merge branch 'master' into hpbarfix

HerculesWS · Sep 22, 2020 · 331a929 · 331a929
2 parents d9bc6d3 + 1354b01
commit 331a929
Show file tree

Hide file tree

Showing 102 changed files with 3,352 additions and 2,309 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build:

diff --git a/.github/workflows/clang10_test.yml b/.github/workflows/clang10_test.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build:

diff --git a/.github/workflows/gcc10_test.yml b/.github/workflows/gcc10_test.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build:

diff --git a/.github/workflows/gcc9_test.yml b/.github/workflows/gcc9_test.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build:

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build:

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -7,7 +7,7 @@ env:
   MYSQL_USER: 'ragnarok'
   MYSQL_PASSWORD: 'ragnarok'
   MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python
+  DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python2
 
 jobs:
   build: