Browse Source

fix docker's context on github

master
Damian Mee 5 years ago
parent
commit
2f1fa9eaeb
No known key found for this signature in database GPG Key ID: 2F961EAB8789725D
  1. 4
      .github/workflows/dockerarm.yml
  2. 4
      .github/workflows/dockerimage.yml
  3. 0
      0.18/skip-fs-test-of-utf8.patch
  4. 13
      0.18/source/skip-fs-test-of-utf8.patch

4
.github/workflows/dockerarm.yml

@ -8,6 +8,6 @@ jobs:
- name: Register self-compiled qemu
run: docker run --rm --privileged meedamian/simple-qemu-test:minimal --reset -p yes
- name: Start building the Docker image (1st part)
run: docker images && docker build -t partial-bitcoind-arm -f 0.18/source/Dockerfile .
run: docker images && docker build -t partial-bitcoind-arm -f 0.18/source/Dockerfile 0.18/
- name: Complete the Docker image (2snd part)
run: docker images && docker build -t bitcoind-arm -f 0.18/source/Dockerfile.part2 .
run: docker images && docker build -t bitcoind-arm -f 0.18/source/Dockerfile.part2 0.18/

4
.github/workflows/dockerimage.yml

@ -6,6 +6,6 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Start building the Docker image (1st part)
run: docker images && docker build -t partial-bitcoind-amd64 -f 0.18/source-native/Dockerfile .
run: docker images && docker build -t partial-bitcoind-amd64 -f 0.18/source-native/Dockerfile 0.18/
- name: Complete the Docker image (2snd part)
run: docker images && docker build -t bitcoind-amd64 -f 0.18/source-native/Dockerfile.part2 .
run: docker images && docker build -t bitcoind-amd64 -f 0.18/source-native/Dockerfile.part2 0.18/

0
0.18/source-native/skip-fs-test-of-utf8.patch → 0.18/skip-fs-test-of-utf8.patch

13
0.18/source/skip-fs-test-of-utf8.patch

@ -1,13 +0,0 @@
diff --git src/test/fs_tests.cpp src/test/fs_tests.cpp
index 93aee10bb..4a01e2ed8 100644
--- src/test/fs_tests.cpp
+++ src/test/fs_tests.cpp
@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(fsbridge_fstream)
fs::path tmpfolder = SetDataDir("fsbridge_fstream");
// tmpfile1 should be the same as tmpfile2
fs::path tmpfile1 = tmpfolder / "fs_tests_₿_🏃";
- fs::path tmpfile2 = tmpfolder / L"fs_tests_₿_🏃";
+ fs::path tmpfile2 = tmpfolder / "fs_tests_₿_🏃";
{
fsbridge::ofstream file(tmpfile1);
file << "bitcoin";
Loading…
Cancel
Save