Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit a1b9685

Browse files
author
Szymon Romik
authored
Merge pull request #789 from lukaszstolarczuk/merge-stable-1.9-into-stable-1.10
Merge stable 1.9 into stable 1.10
2 parents 83f6c2a + c5a2f29 commit a1b9685

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

.github/workflows/gha.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ jobs:
9191
with:
9292
fetch-depth: 50
9393

94-
- name: Use old vcpkg for pmdk to build properly
95-
working-directory: C:/vcpkg
96-
run: |
97-
git fetch --unshallow --tags
98-
git checkout 6709d3d7d0cba96508ba3606f810ab562ea32556
99-
100-
- name: Use old vcpkg for pmdk to build properly
101-
working-directory: C:/vcpkg
102-
run: |
103-
git fetch --unshallow --tags
104-
git checkout 6709d3d7d0cba96508ba3606f810ab562ea32556
105-
10694
- name: Install PMDK
10795
run: |
10896
vcpkg install pmdk:x64-windows

utils/docker/images/Dockerfile.archlinux-base-latest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2016-2020, Intel Corporation
33

44
#
5-
Dockerfile - a 'recipe' for Docker to build an image of archlinux-based
5+
# Dockerfile - a 'recipe' for Docker to build an image of archlinux-based
66
# environment prepared for running libpmemobj-cpp tests.
77
#
88

0 commit comments

Comments
 (0)