From e110c63d53402af4b6fb9e2f7acccb694044eb96 Mon Sep 17 00:00:00 2001 From: Laura <60604372+lauramurgatroyd@users.noreply.github.com> Date: Mon, 23 May 2022 16:54:02 +0100 Subject: [PATCH 1/3] test lib_egl fix --- .github/workflows/conda_build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index fdaf8aff..5eacdfc7 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: publish-to-conda - uses: paskino/conda-package-publish-action@v1.4.3 + uses: paskino/conda-package-publish-action@install_lib_egl with: subDir: 'Wrappers/Python/conda-recipe' channels: 'conda-forge -c paskino' From 0e9c6b63645e89dc443c21e710dc442cd4693aa7 Mon Sep 17 00:00:00 2001 From: Laura <60604372+lauramurgatroyd@users.noreply.github.com> Date: Tue, 24 May 2022 11:49:22 +0100 Subject: [PATCH 2/3] test add_apt_packages branch of action --- .github/workflows/conda_build_and_publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 5eacdfc7..0c7bf720 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -16,11 +16,12 @@ jobs: steps: - uses: actions/checkout@v1 - name: publish-to-conda - uses: paskino/conda-package-publish-action@install_lib_egl + uses: paskino/conda-package-publish-action@add_apt_packages with: subDir: 'Wrappers/Python/conda-recipe' - channels: 'conda-forge -c paskino' + channels: '-c conda-forge -c paskino' AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} publish: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }} test_all: ${{(github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')) || (github.ref == 'refs/heads/master')}} + additional_apt_packages: 'libegl1-mesa libegl1-mesa-dev' From 21c6c8fc9b7e27685e2d7e7f1f79fb454ab63369 Mon Sep 17 00:00:00 2001 From: Laura <60604372+lauramurgatroyd@users.noreply.github.com> Date: Wed, 25 May 2022 10:58:05 +0100 Subject: [PATCH 3/3] use v1.4.4 of conda-package-publish-action --- .github/workflows/conda_build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda_build_and_publish.yml b/.github/workflows/conda_build_and_publish.yml index 0c7bf720..03b8241f 100644 --- a/.github/workflows/conda_build_and_publish.yml +++ b/.github/workflows/conda_build_and_publish.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: publish-to-conda - uses: paskino/conda-package-publish-action@add_apt_packages + uses: paskino/conda-package-publish-action@v1.4.4 with: subDir: 'Wrappers/Python/conda-recipe' channels: '-c conda-forge -c paskino'