Commit fe9a7c5f authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/master' into server

parents 1e47b84e 1b1b8edd
...@@ -437,8 +437,8 @@ jobs: ...@@ -437,8 +437,8 @@ jobs:
- name: Copy premake files - name: Copy premake files
run: | run: |
cp -r premake/* . cp -pr premake/* .
cp -r resource/* . cp -pr resource/* .
- name: Use premake to generate make files (apt packages) - name: Use premake to generate make files (apt packages)
if: matrix.static-link != true if: matrix.static-link != true
...@@ -664,8 +664,8 @@ jobs: ...@@ -664,8 +664,8 @@ jobs:
- name: Copy premake files - name: Copy premake files
run: | run: |
cp -r premake/* . cp -pr premake/* .
cp -r resource/* . cp -pr resource/* .
- name: Use premake to generate make files (Homebrew packages) - name: Use premake to generate make files (Homebrew packages)
if: matrix.static-link != true if: matrix.static-link != true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment