From dbb067c963977704ab2a4a2614a1b0b913196f46 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Wed, 28 Feb 2024 18:56:48 +0000 Subject: [PATCH 01/14] Use my fork of actions-setup-docker that does not give up as soon waiting for docker to start up during .github/workflows/reproducible.yaml. --- .github/workflows/reproducible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index e2eb275645f..36eb71e39cf 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -34,7 +34,7 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi - - uses: docker-practice/actions-setup-docker@master + - uses: daniel-wong-dfinity-org/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From 4ae78229d5f542a680f9ed04bbb8963f7d50ae9e Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 08:28:40 +0000 Subject: [PATCH 02/14] Changelog. --- CHANGELOG-Nns-Dapp-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md index d7b0a6d2150..64a3d6b52b1 100644 --- a/CHANGELOG-Nns-Dapp-unreleased.md +++ b/CHANGELOG-Nns-Dapp-unreleased.md @@ -56,6 +56,7 @@ proposal is successful, the changes it released will be moved from this file to * Fixed the formatting command in the `update-aggregator-response` GitHub workflow. * Disambiguated the title of the docker reproducibility check. * Change the number of accounts tested in `test-upgrade-map-stable` from 1000 to 20. +* Increased timeout for starting up docker from 3 min to 10 min in workflow/reproducible.yaml. #### Deprecated From e672d7e26538acc95b7f6e18a40131dc4405e115 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 08:50:22 +0000 Subject: [PATCH 03/14] spelling --- CHANGELOG-Nns-Dapp-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md index 64a3d6b52b1..0da0b0e4c33 100644 --- a/CHANGELOG-Nns-Dapp-unreleased.md +++ b/CHANGELOG-Nns-Dapp-unreleased.md @@ -57,6 +57,7 @@ proposal is successful, the changes it released will be moved from this file to * Disambiguated the title of the docker reproducibility check. * Change the number of accounts tested in `test-upgrade-map-stable` from 1000 to 20. * Increased timeout for starting up docker from 3 min to 10 min in workflow/reproducible.yaml. +* Increased timeout for starting up docker from 3 min to 10 min in `reproducible` workflow. #### Deprecated From 0762c11cbaa80681fa277cd8585162befc666803 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 14:08:34 +0000 Subject: [PATCH 04/14] Switched to a different fork of actions-setup-docker. This one is controlled by DFINITY. --- .github/workflows/reproducible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 36eb71e39cf..089e45c5791 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -34,7 +34,7 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi - - uses: daniel-wong-dfinity-org/actions-setup-docker@wait-longer-for-docker-to-start-up + - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From 9bd29eea078de92487573f41571479eb27a55c5b Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 14:18:06 +0000 Subject: [PATCH 05/14] Comment that explains we forked, the difference, and why. --- .github/workflows/reproducible.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 089e45c5791..fe0304104b1 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -34,6 +34,12 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi + # This is a fork from + # https://github.com/docker-practice/actions-setup-docker The difference + # is that this waits up to 10 minutes for docker to start instead of + # just 3. The reason a fork was created is that the original developer + # has not responded for almost a year while people have reported issues + # and even made a pull request. - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout From 7fc2276a935d784993a026e5bddecb9124f7b26c Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 14:37:10 +0000 Subject: [PATCH 06/14] Corrected a small mistake that I made while trying to resolve conflicts a few minutes ago while doing git rebase. --- CHANGELOG-Nns-Dapp-unreleased.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md index 0da0b0e4c33..d710cf54afd 100644 --- a/CHANGELOG-Nns-Dapp-unreleased.md +++ b/CHANGELOG-Nns-Dapp-unreleased.md @@ -56,7 +56,6 @@ proposal is successful, the changes it released will be moved from this file to * Fixed the formatting command in the `update-aggregator-response` GitHub workflow. * Disambiguated the title of the docker reproducibility check. * Change the number of accounts tested in `test-upgrade-map-stable` from 1000 to 20. -* Increased timeout for starting up docker from 3 min to 10 min in workflow/reproducible.yaml. * Increased timeout for starting up docker from 3 min to 10 min in `reproducible` workflow. #### Deprecated From 4d0e1f241f556dc486c96ff80060132e870af455 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 14:49:32 +0000 Subject: [PATCH 07/14] By adding a comment to a yaml file, I somehow introduced a syntax error. --- .github/workflows/reproducible.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index fe0304104b1..5f0eaaf9803 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -34,12 +34,12 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi - # This is a fork from - # https://github.com/docker-practice/actions-setup-docker The difference - # is that this waits up to 10 minutes for docker to start instead of - # just 3. The reason a fork was created is that the original developer - # has not responded for almost a year while people have reported issues - # and even made a pull request. + # This uses a fork from + # https://github.com/docker-practice/actions-setup-docker The difference + # is that this waits up to 10 minutes for docker to start instead of + # just 3. The reason a fork was created is that the original developer + # has not responded for almost a year while people have reported issues + # and even made a pull request. - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout From 1d05737991dc9256eab1b717d6c5c13467ed3c24 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 15:29:04 +0000 Subject: [PATCH 08/14] Minor change. Hopefully, this will cause an external settings change to be noticed??? --- .github/workflows/reproducible.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 5f0eaaf9803..ad1d9e46944 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -38,8 +38,8 @@ jobs: # https://github.com/docker-practice/actions-setup-docker The difference # is that this waits up to 10 minutes for docker to start instead of # just 3. The reason a fork was created is that the original developer - # has not responded for almost a year while people have reported issues - # and even made a pull request. + # has not responded for almost a year while people have reported related + # issues and even made a pull request. - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout From 37682b5c5696c47eb08ac29060ed10bc60a53227 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 15:34:39 +0000 Subject: [PATCH 09/14] Another minor comment change. Again, hoping to cause a settings change to be seen. --- .github/workflows/reproducible.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index ad1d9e46944..d5d57069f9f 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -36,10 +36,10 @@ jobs: fi # This uses a fork from # https://github.com/docker-practice/actions-setup-docker The difference - # is that this waits up to 10 minutes for docker to start instead of - # just 3. The reason a fork was created is that the original developer - # has not responded for almost a year while people have reported related - # issues and even made a pull request. + # is that this waits up to 10 minutes for docker to start instead of just + # 3. The reason for this fork is that the original developer has not + # responded for almost a year while people have reported related issues + # and even made a pull request. - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout From c42e63f7698dd05e273b17a1d9942b20e44ad099 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 15:57:39 +0000 Subject: [PATCH 10/14] Added `name: Install Docker` in desparate attempt to get `reproducible` workflow working. --- .github/workflows/reproducible.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index d5d57069f9f..3cde61289c0 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -34,13 +34,14 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi - # This uses a fork from - # https://github.com/docker-practice/actions-setup-docker The difference - # is that this waits up to 10 minutes for docker to start instead of just - # 3. The reason for this fork is that the original developer has not - # responded for almost a year while people have reported related issues - # and even made a pull request. - - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up + - name: Install Docker + # This uses a fork from + # https://github.com/docker-practice/actions-setup-docker The difference + # is that this waits up to 10 minutes for docker to start instead of + # just 3. The reason for this fork is that the original developer has + # not responded for almost a year while people have reported related + # issues and even made a pull request. + uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From 80c89e064041aefcafdfd5e2a3d848ab69ce137e Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 16:17:40 +0000 Subject: [PATCH 11/14] More desparate attempts to see dfinity/actions-setup-docker... --- .github/workflows/reproducible.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 3cde61289c0..b979aba18e6 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -41,7 +41,8 @@ jobs: # just 3. The reason for this fork is that the original developer has # not responded for almost a year while people have reported related # issues and even made a pull request. - uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up + # uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up + uses: dfinity/actions-setup-docker timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From aca2e8acf6ef4e405d1bd3310b050e8a427864c6 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 16:18:50 +0000 Subject: [PATCH 12/14] Appended @master to dfinity/actions-setup-docker. --- .github/workflows/reproducible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index b979aba18e6..95676a122f8 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -42,7 +42,7 @@ jobs: # not responded for almost a year while people have reported related # issues and even made a pull request. # uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up - uses: dfinity/actions-setup-docker + uses: dfinity/actions-setup-docker@master timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From cd4493c2e81d3985765dfe83f4bce983e7b29aa1 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 16:21:27 +0000 Subject: [PATCH 13/14] Try to go back to a known good state... --- .github/workflows/reproducible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 95676a122f8..8618a693dce 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -42,7 +42,7 @@ jobs: # not responded for almost a year while people have reported related # issues and even made a pull request. # uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up - uses: dfinity/actions-setup-docker@master + uses: docker-practice/actions-setup-docker@master timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4 From 66450813adc096e0a193314fbfce1aebffaeedc4 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Thu, 29 Feb 2024 16:24:50 +0000 Subject: [PATCH 14/14] Switch back to the dfinity fork of actions-setup-docker. --- .github/workflows/reproducible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 8618a693dce..95676a122f8 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -42,7 +42,7 @@ jobs: # not responded for almost a year while people have reported related # issues and even made a pull request. # uses: dfinity/actions-setup-docker@wait-longer-for-docker-to-start-up - uses: docker-practice/actions-setup-docker@master + uses: dfinity/actions-setup-docker@master timeout-minutes: 12 - name: Checkout uses: actions/checkout@v4