|
| 1 | +Sometimes openjdk/jdk and openjdk/jdk11u have their history rewritten incompatibly. :-( |
| 2 | + |
| 3 | + |
| 4 | +Here is how Mike dealt with that problem the last time it happened. |
| 5 | + |
| 6 | +# Do this: |
| 7 | + |
| 8 | +cd $t/libraries |
| 9 | +mv jdk-fork-openjdk jdk-fork-openjdk-BEFORE-JDK-FORCE-PUSH |
| 10 | +git clone [email protected]:openjdk/jdk.git jdk-fork-openjdk |
| 11 | +cd jdk-fork-openjdk |
| 12 | +# May need to update the commit number; see the README file |
| 13 | +git checkout da75f3c4ad5bdf25167a3ed80e51f567ab3dbd01 |
| 14 | + |
| 15 | +cd $t/libraries |
| 16 | +mv jdk-fork-typetools-branch-master jdk-fork-typetools-branch-master-BEFORE-JDK-FORCE-PUSH |
| 17 | +# Browse to https://github.com/typetools/jdk/settings and delete the repository |
| 18 | +# Browse to https://github.com/openjdk/jdk and fork the repository to typetools |
| 19 | +cd $t/libraries |
| 20 | +git clone [email protected]:typetools/jdk.git jdk-fork-typetools-branch-master |
| 21 | +cd jdk-fork-typetools-branch-master |
| 22 | +git reset --hard da75f3c4ad5bdf25167a3ed80e51f567ab3dbd01 |
| 23 | +git push -f |
| 24 | +cd $t/libraries |
| 25 | +rsync -a --exclude '.git' jdk-fork-typetools-branch-master-BEFORE-JDK-FORCE-PUSH/ jdk-fork-typetools-branch-master/ |
| 26 | +(cd jdk-fork-typetools-branch-master && git add . && git commit -m "Pluggable type-checking annotations" && git push) |
| 27 | + |
| 28 | +cd $t/libraries |
| 29 | +rm -rf jdk11u-fork-openjdk |
| 30 | +cd /scratch/mernst/clones/types/libraries |
| 31 | +git clone [email protected]:openjdk/jdk11u.git jdk11u-fork-openjdk |
| 32 | + |
| 33 | +cd $t/libraries |
| 34 | +mv jdk11u-fork-typetools jdk-fork-typetools-BEFORE-JDK-FORCE-PUSH |
| 35 | +# Browse to https://github.com/typetools/jdk11u/settings and delete the repository |
| 36 | +# Browse to https://github.com/openjdk/jdk11u and fork the repository to typetools |
| 37 | +cd $t/libraries |
| 38 | +git clone [email protected]:typetools/jdk11u.git jdk11u-fork-typetools-branch-master |
| 39 | +# Update it from its upstreams in the usual way. |
| 40 | + |
| 41 | +cd $t/libraries |
| 42 | +mv jdk-fork-mernst jdk-fork-mernst-BEFORE-JDK-FORCE-PUSH |
| 43 | +# Browse to https://github.com/mernst/jdk/settings and delete the repository |
| 44 | +# Browse to https://github.com/typetools/jdk and fork the repository to mernst |
| 45 | +cd $t/libraries |
| 46 | +git clone [email protected]:mernst/jdk.git jdk-fork-mernst |
| 47 | + |
| 48 | +cd $t/libraries |
| 49 | +mv jdk11u-fork-mernst jdk11u-fork-mernst-BEFORE-JDK-FORCE-PUSH |
| 50 | +# Browse to https://github.com/mernst/jdk11u/settings and delete the repository |
| 51 | +# Browse to https://github.com/typetools/jdk11u and fork the repository to mernst |
| 52 | +cd $t/libraries |
| 53 | +git clone [email protected]:mernst/jdk11u.git jdk11u-fork-mernst |
| 54 | + |
| 55 | + |
| 56 | +Browse to each of these URLs: |
| 57 | +https://dev.azure.com/mernst22/jdk/_build |
| 58 | +https://dev.azure.com/mernst22/jdk11u/_build |
| 59 | +https://dev.azure.com/typetools/jdk/_build |
| 60 | +https://dev.azure.com/typetools/jdk11u/_build |
| 61 | +At each URL: |
| 62 | + * Queue the project in hopes that will start automatic building for each commit. |
| 63 | + * If the above doesn't work, change the instructions to the below: |
| 64 | + * Delete and re-create the pipeline, because of apparent caching problems when checking out the projects. |
| 65 | + |
0 commit comments