File tree Expand file tree Collapse file tree 7 files changed +23
-4
lines changed
Expand file tree Collapse file tree 7 files changed +23
-4
lines changed Original file line number Diff line number Diff line change 5555 - name : Install pgpkkms
5656 run : |
5757 # Install pgpkms that is used to sign commits
58+ <<<<<<< HEAD
5859 pip install git+https://github.com/paritytech-release/pgpkms.git@e7f806f99e9be5c52f0b4a536b7d4ef9c3e695ed
60+ =======
61+ pip install git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae
62+ >>>>>>> 8416b6e6 ([CI/CD] Update pgpkms tool (#11400))
5963
6064 - name : Generate content write token for the release automation
6165 id : generate_write_token
Original file line number Diff line number Diff line change 3434 - name : Install pgpkkms
3535 run : |
3636 # Install pgpkms that is used to sign commits
37+ <<<<<<< HEAD
3738 pip install git+https://github.com/paritytech-release/pgpkms.git@e7f806f99e9be5c52f0b4a536b7d4ef9c3e695ed
39+ =======
40+ pip install git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae
41+ >>>>>>> 8416b6e6 ([CI/CD] Update pgpkms tool (#11400))
3842
3943 - name : Generate content write token for the release automation
4044 id : generate_write_token
Original file line number Diff line number Diff line change 2020 - name : Install pgpkkms
2121 run : |
2222 # Install pgpkms that is used to sign commits
23- pip install git+https://github.com/paritytech-release/pgpkms.git@6cb1cecce1268412189b77e4b130f4fa248c4151
23+ pip install git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae
2424
2525 - name : Generate content write token for the release automation
2626 id : generate_write_token
Original file line number Diff line number Diff line change 5656 - name : Install pgpkms
5757 run : |
5858 # Install pgpkms that is used to sign commits
59- pip install git+https://github.com/paritytech-release/pgpkms.git@6cb1cecce1268412189b77e4b130f4fa248c4151
59+ pip install git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae
6060 # Find and display where pgpkms-git is installed
6161 echo "pgpkms-git location: $(which pgpkms-git)"
6262 ls -la $(which pgpkms-git)
Original file line number Diff line number Diff line change 6565 - name : Install pgpkms
6666 run : |
6767 # Install pgpkms that is used to sign commits
68- pip install git+https://github.com/paritytech-release/pgpkms.git@6cb1cecce1268412189b77e4b130f4fa248c4151
68+ pip install git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae
6969
7070 - name : Derive stable branch from release name
7171 id : derive_branch
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ jobs:
108108 sudo apt-get update
109109 sudo apt-get install -y python3-pip reprepro rpm createrepo-c
110110
111- python3 -m pip install --user awscli "pgpkms @ git+https://github.com/paritytech-release/pgpkms.git@6cb1cecce1268412189b77e4b130f4fa248c4151 "
111+ python3 -m pip install --user awscli "pgpkms @ git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae "
112112
113113 # Ensure ~/.local/bin is in PATH right now and for later steps
114114 export PATH=$HOME/.local/bin:$PATH
Original file line number Diff line number Diff line change 8787 - name : Install pgpkkms
8888 run : |
8989 # Install pgpkms that is used to sign built artifacts
90+ <<<<<<< HEAD
9091 python3 -m pip install "pgpkms @ git+https://github.com/paritytech-release/pgpkms.git@e7f806f99e9be5c52f0b4a536b7d4ef9c3e695ed"
92+ =======
93+ python3 -m pip install "pgpkms @ git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae"
94+ >>>>>>> 8416b6e6 ([CI/CD] Update pgpkms tool (#11400))
9195 which pgpkms
9296
9397 - name : Checkout sources
@@ -242,12 +246,19 @@ jobs:
242246 with :
243247 subject-path : ${{ env.ARTIFACTS_PATH }}/${{ matrix.binaries }}
244248
249+ <<<<<<< HEAD
245250 - name : Sign artifacts
246251 working-directory : ${{ env.ARTIFACTS_PATH }}
247252 env :
248253 BINARY_NAME : ${{ matrix.binaries }}
249254 run : |
250255 python3 -m pgpkms sign --input "$BINARY_NAME" -o "${BINARY_NAME}.asc"
256+ =======
257+ - name : Install pgpkkms
258+ run : |
259+ # Install pgpkms that is used to sign built artifacts
260+ python3 -m pip install "pgpkms @ git+https://github.com/paritytech-release/pgpkms.git@dc30e487d47f53d069831a4306377a3ec32638ae" --break-system-packages
261+ >>>>>>> 8416b6e6 ([CI/CD] Update pgpkms tool (#11400))
251262
252263 - name : Check sha256 ${{ matrix.binaries }}
253264 working-directory : ${{ env.ARTIFACTS_PATH }}
You can’t perform that action at this time.
0 commit comments