From fe6cb0994bffe55746d37b8340eadfe5c37e30e4 Mon Sep 17 00:00:00 2001 From: dasm Date: Thu, 26 Jun 2025 15:02:01 -0700 Subject: [PATCH 1/2] Use setup from the tools repo --- .github/workflows/commit.yml | 4 ++-- .github/workflows/merge_queue.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index a0bc0b01..efca4d5f 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - run: poetry run nox -s build - name: Archive packaged library uses: actions/upload-artifact@v4 @@ -35,7 +35,7 @@ jobs: - name: Checkout code repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - name: Download dist uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml index a7901489..18c00341 100644 --- a/.github/workflows/merge_queue.yml +++ b/.github/workflows/merge_queue.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - run: poetry run nox -s build - name: Archive packaged library uses: actions/upload-artifact@v4 @@ -32,7 +32,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - name: Download dist uses: actions/download-artifact@v4 with: @@ -47,7 +47,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - name: Download dist uses: actions/download-artifact@v4 with: @@ -61,7 +61,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Set up runner - uses: ./.github/actions/setup + uses: opendp/tumult-tools/actions/setup@8c782791336723e50fa70576a220b7aa023b2864 - name: Download dist uses: actions/download-artifact@v4 with: From aa5d276dea361ade1931bb1d22489e88008dadbd Mon Sep 17 00:00:00 2001 From: dasm Date: Fri, 27 Jun 2025 10:11:58 -0700 Subject: [PATCH 2/2] Delete local setup action. --- .github/actions/setup/action.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/actions/setup/action.yml diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml deleted file mode 100644 index c197ed7a..00000000 --- a/.github/actions/setup/action.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: 'Setup' -description: 'Initialize a github actions runner for Analytics CI jobs.' -runs: - using: "composite" - steps: - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: '3.9' - - run: java -version - shell: bash - - run: python --version - shell: bash - - run: curl -sSL https://install.python-poetry.org | python3 - - shell: bash - - run: poetry self lock - shell: bash - - run: poetry self show - shell: bash - - run: poetry --version - shell: bash - - run: poetry install --only scripting - shell: bash - # Use same abbreviated SHA of first 7 characters across different CI jobs for the same commit. - # Without this there are random failures due to different abbreviations while installing apro package. - # https://github.com/mtkennerly/dunamai/issues/89 - - run: git config core.abbrev 7 - shell: bash \ No newline at end of file