Skip to content

Commit 2ca4723

Browse files
tbenthompsontbenthompson
authored
Remove QC internal stuff (#119)
* Remove secret conda channel and docs. * Remove secret conda channel and docs. * Install yq before we use it. * Install conda-build. * Add conda-forge to macos build?
1 parent 86d781a commit 2ca4723

21 files changed

+21
-124
lines changed

‎.github/actions/conda-build/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
required: true
77
runs:
88
using: 'docker'
9-
image: ***REMOVED***:latest
9+
image: condaforge/mambaforge:latest
1010
args:
1111
- /bin/bash
1212
- "-l"

‎.github/actions/deployment/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
required: true
77
runs:
88
using: 'docker'
9-
image: ***REMOVED***:latest
9+
image: condaforge/mambaforge:latest
1010
args:
1111
- /bin/bash
1212
- "-l"

‎.github/actions/docs/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
required: true
77
runs:
88
using: 'docker'
9-
image: ***REMOVED***:latest
9+
image: condaforge/mambaforge:latest
1010
args:
1111
- /bin/bash
1212
- "-l"

‎.github/actions/linter/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run linter in Docker image
22
description: Run private container from GitHub Packages Registry after Docker login
33
runs:
44
using: 'docker'
5-
image: ***REMOVED***:latest
5+
image: condaforge/mambaforge:latest
66
args:
77
- /bin/bash
88
- "-l"

‎.github/actions/unittests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
required: true
77
runs:
88
using: 'docker'
9-
image: ***REMOVED***:latest
9+
image: condaforge/mambaforge:latest
1010
args:
1111
- /bin/bash
1212
- "-l"

‎.github/workflows/.condarc

-5
This file was deleted.

‎.github/workflows/ci.yml

+9-31
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: true
1212
steps:
13-
- name: Docker login
14-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
1513
- name: Pull image
16-
run: docker pull ***REMOVED***:latest
14+
run: docker pull condaforge/mambaforge:latest
1715
- name: Checkout branch
1816
uses: actions/[email protected]
1917
with:
@@ -30,21 +28,12 @@ jobs:
3028
matrix:
3129
PYTHON_VERSION: ['3.6', '3.7', '3.8', '3.9']
3230
steps:
33-
- name: Docker login
34-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
3531
- name: Pull image
36-
run: docker pull ***REMOVED***:latest
32+
run: docker pull condaforge/mambaforge:latest
3733
- name: Checkout branch
3834
uses: actions/[email protected]
3935
with:
4036
ref: ${{ github.head_ref }}
41-
- uses: google-github-actions/[email protected]
42-
with:
43-
version: '349.0.0'
44-
project_id: ${{ secrets.GCP_UPLOAD_PROJECT_ID }}
45-
service_account_email: ${{ secrets.GCP_UPLOAD_SA_EMAIL }}
46-
service_account_key: ${{ secrets.GCP_UPLOAD_SA_KEY }}
47-
export_default_credentials: true
4837
- name: Run CI inside of container
4938
uses: ./.github/actions/unittests
5039
with:
@@ -59,30 +48,21 @@ jobs:
5948
matrix:
6049
PYTHON_VERSION: ['3.8']
6150
steps:
62-
- name: Docker login
63-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
6451
- name: Pull image
65-
run: docker pull ***REMOVED***:latest
52+
run: docker pull condaforge/mambaforge:latest
6653
- name: Checkout branch
6754
uses: actions/[email protected]
6855
with:
6956
ref: ${{ github.head_ref }}
70-
- uses: google-github-actions/[email protected]
71-
with:
72-
version: '349.0.0'
73-
project_id: ${{ secrets.GCP_UPLOAD_PROJECT_ID }}
74-
service_account_email: ${{ secrets.GCP_UPLOAD_SA_EMAIL }}
75-
service_account_key: ${{ secrets.GCP_UPLOAD_SA_KEY }}
76-
export_default_credentials: true
7757
- name: Run CI inside of container
7858
uses: ./.github/actions/docs
7959
with:
8060
python_version: ${{ matrix.PYTHON_VERSION }}
81-
- name: Publish Docs
82-
run: cd docs/_build/html && gsutil -m cp -r * gs://***REMOVED***/${GITHUB_REPOSITORY}/${GITHUB_SHA}/
83-
- name: Publish Docs as latest
84-
run: cd docs/_build/html && gsutil -m cp -r * gs://***REMOVED***/${GITHUB_REPOSITORY}/latest/
85-
if: github.ref == 'refs/heads/master'
61+
# - name: Publish Docs
62+
# run: cd docs/_build/html && gsutil -m cp -r * gs://***REMOVED***/${GITHUB_REPOSITORY}/${GITHUB_SHA}/
63+
# - name: Publish Docs as latest
64+
# run: cd docs/_build/html && gsutil -m cp -r * gs://***REMOVED***/${GITHUB_REPOSITORY}/latest/
65+
# if: github.ref == 'refs/heads/master'
8666
linux-conda-build:
8767
name: "Linux - conda-build - Python ${{ matrix.CONDA_BUILD_YML }}"
8868
runs-on: ubuntu-latest
@@ -94,10 +74,8 @@ jobs:
9474
CONDA_BUILD_YML:
9575
- linux_64_python3.7_default.____cpython
9676
steps:
97-
- name: Docker login
98-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
9977
- name: Pull image
100-
run: docker pull ***REMOVED***:latest
78+
run: docker pull condaforge/mambaforge:latest
10179
- name: Checkout branch
10280
uses: actions/[email protected]
10381
with:

‎.github/workflows/conda-build-linux-master.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ jobs:
1717
- linux_64_python3.8_skylake.____cpython
1818
- linux_64_python3.9_default.____cpython
1919
steps:
20-
- name: Docker login
21-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
2220
- name: Pull image
23-
run: docker pull ***REMOVED***:latest
21+
run: docker pull condaforge/mambaforge:latest
2422
- name: Checkout branch
2523
uses: actions/[email protected]
2624
with:

‎.github/workflows/conda-build-macos.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
runs-on: macos-latest
1111
env:
1212
CI: True
13-
***REMOVED***: ${{ secrets.***REMOVED*** }}
14-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1513
CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
1614
strategy:
1715
fail-fast: false
@@ -26,20 +24,12 @@ jobs:
2624
uses: actions/[email protected]
2725
with:
2826
ref: ${{ github.head_ref }}
29-
- name: Create .condarc
30-
shell: bash -l {0}
31-
run: |
32-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
33-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
34-
env:
35-
***REMOVED***: ${{ secrets.***REMOVED*** }}
36-
***REMOVED***: ${{ secrets.***REMOVED*** }}
3727
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
3828
with:
3929
miniforge-variant: Mambaforge
4030
miniforge-version: 4.10.0-0
31+
channels: conda-forge
4132
use-mamba: true
42-
condarc-file: .github/workflows/.condarc
4333
- name: Build conda package
4434
shell: bash -l {0}
4535
run: ./.github/workflows/macos-conda-build.sh

‎.github/workflows/conda-build-win.yml

-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
runs-on: windows-latest
1111
env:
1212
CI: True
13-
***REMOVED***: ${{ secrets.***REMOVED*** }}
14-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1513
CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
1614
strategy:
1715
fail-fast: false
@@ -23,17 +21,11 @@ jobs:
2321
uses: actions/[email protected]
2422
with:
2523
ref: ${{ github.head_ref }}
26-
- name: Create .condarc
27-
shell: pwsh
28-
run: |
29-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
30-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
3124
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
3225
with:
3326
miniforge-variant: Mambaforge
3427
miniforge-version: 4.10.0-0
3528
use-mamba: true
36-
condarc-file: .github/workflows/.condarc
3729
- name: Build conda package
3830
shell: pwsh
3931
run: |

‎.github/workflows/conda-build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ export CONDA_BUILD_YML=$1
77
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
88
source ${SCRIPT_DIR}/base.sh $*
99
conda activate base
10+
mamba install -y conda-build
1011
conda build -m .ci_support/${CONDA_BUILD_YML}.yaml conda.recipe

‎.github/workflows/docs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -exo pipefail
55
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
66
source ${SCRIPT_DIR}/base.sh $*
77

8+
mamba install -y yq
89
yq -Y '. + {dependencies: [.dependencies[], "python=3.8"] }' environment.yml > /tmp/environment.yml
910
mamba env create -f /tmp/environment.yml
1011
conda activate $(yq -r .name environment.yml)

‎.github/workflows/macos.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -exo pipefail
55
source ~/.profile
66
mamba install -y yq jq
77

8+
mamba install -y yq
89
yq -Y ". + {dependencies: [.dependencies[], \"python=${PYTHON_VERSION}\"] }" environment.yml > /tmp/environment.yml
910
mamba env create -f /tmp/environment.yml
1011
conda activate $(yq -r .name environment.yml)

‎.github/workflows/tag.yml

+1-21
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
runs-on: ubuntu-latest
1111
env:
1212
CI: True
13-
***REMOVED***: ${{ secrets.***REMOVED*** }}
14-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1513
CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
1614
strategy:
1715
fail-fast: false
@@ -26,10 +24,8 @@ jobs:
2624
- linux_64_python3.9_default.____cpython
2725
- linux_64_python3.9_skylake.____cpython
2826
steps:
29-
- name: Docker login
30-
run: docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
3127
- name: Pull image
32-
run: docker pull ***REMOVED***:latest
28+
run: docker pull condaforge/mambaforge:latest
3329
- name: Checkout branch
3430
uses: actions/[email protected]
3531
with:
@@ -48,8 +44,6 @@ jobs:
4844
runs-on: macos-latest
4945
env:
5046
CI: True
51-
***REMOVED***: ${{ secrets.***REMOVED*** }}
52-
***REMOVED***: ${{ secrets.***REMOVED*** }}
5347
CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
5448
strategy:
5549
fail-fast: false
@@ -70,17 +64,11 @@ jobs:
7064
uses: actions/[email protected]
7165
with:
7266
ref: ${{ github.head_ref }}
73-
- name: Create .condarc
74-
shell: bash -l {0}
75-
run: |
76-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
77-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
7867
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
7968
with:
8069
miniforge-variant: Mambaforge
8170
miniforge-version: 4.10.0-0
8271
use-mamba: true
83-
condarc-file: .github/workflows/.condarc
8472
- name: Build and upload conda package
8573
shell: bash -l {0}
8674
run: ./.github/workflows/macos-tag.sh
@@ -90,8 +78,6 @@ jobs:
9078
runs-on: windows-latest
9179
env:
9280
CI: True
93-
***REMOVED***: ${{ secrets.***REMOVED*** }}
94-
***REMOVED***: ${{ secrets.***REMOVED*** }}
9581
CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
9682
strategy:
9783
fail-fast: false
@@ -106,17 +92,11 @@ jobs:
10692
uses: actions/[email protected]
10793
with:
10894
ref: ${{ github.head_ref }}
109-
- name: Create .condarc
110-
shell: pwsh
111-
run: |
112-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
113-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
11495
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
11596
with:
11697
miniforge-variant: Mambaforge
11798
miniforge-version: 4.10.0-0
11899
use-mamba: true
119-
condarc-file: .github/workflows/.condarc
120100
- name: Build conda package
121101
shell: pwsh
122102
run: |

‎.github/workflows/test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -exo pipefail
55
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
66
source ${SCRIPT_DIR}/base.sh $*
77

8+
mamba install -y yq
89
yq -Y ". + {dependencies: [.dependencies[], \"python=${PYTHON_VERSION}\"] }" environment.yml > /tmp/environment.yml
910
mamba env create -f /tmp/environment.yml
1011
conda activate $(yq -r .name environment.yml)

‎.github/workflows/tests-macos-master.yml

-11
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
runs-on: macos-latest
1111
env:
1212
CI: True
13-
***REMOVED***: ${{ secrets.***REMOVED*** }}
14-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1513
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
1614
strategy:
1715
fail-fast: true
@@ -22,20 +20,11 @@ jobs:
2220
uses: actions/[email protected]
2321
with:
2422
ref: ${{ github.head_ref }}
25-
- name: Create .condarc
26-
shell: bash -l {0}
27-
run: |
28-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
29-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
30-
env:
31-
***REMOVED***: ${{ secrets.***REMOVED*** }}
32-
***REMOVED***: ${{ secrets.***REMOVED*** }}
3323
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
3424
with:
3525
miniforge-variant: Mambaforge
3626
miniforge-version: 4.10.0-0
3727
use-mamba: true
38-
condarc-file: .github/workflows/.condarc
3928
- name: Run Unit Tests
4029
shell: bash -l {0}
4130
run: ./.github/workflows/macos.sh

‎.github/workflows/tests-macos.yml

-11
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
runs-on: macos-latest
1313
env:
1414
CI: True
15-
***REMOVED***: ${{ secrets.***REMOVED*** }}
16-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1715
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
1816
strategy:
1917
fail-fast: true
@@ -24,20 +22,11 @@ jobs:
2422
uses: actions/[email protected]
2523
with:
2624
ref: ${{ github.head_ref }}
27-
- name: Create .condarc
28-
shell: bash -l {0}
29-
run: |
30-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
31-
sed -ie "s/***REMOVED***/${***REMOVED***}/g" .github/workflows/.condarc
32-
env:
33-
***REMOVED***: ${{ secrets.***REMOVED*** }}
34-
***REMOVED***: ${{ secrets.***REMOVED*** }}
3525
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
3626
with:
3727
miniforge-variant: Mambaforge
3828
miniforge-version: 4.10.0-0
3929
use-mamba: true
40-
condarc-file: .github/workflows/.condarc
4130
- name: Run Unit Tests
4231
shell: bash -l {0}
4332
run: ./.github/workflows/macos.sh

‎.github/workflows/tests-win-master.yml

-8
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ jobs:
99
runs-on: windows-latest
1010
env:
1111
CI: True
12-
***REMOVED***: ${{ secrets.***REMOVED*** }}
13-
***REMOVED***: ${{ secrets.***REMOVED*** }}
1412
strategy:
1513
fail-fast: true
1614
matrix:
@@ -24,18 +22,12 @@ jobs:
2422
uses: actions/[email protected]
2523
with:
2624
ref: ${{ github.head_ref }}
27-
- name: Create .condarc
28-
shell: pwsh
29-
run: |
30-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
31-
((Get-Content -path .github/workflows/.condarc) -replace '***REMOVED***', '${{ secrets.***REMOVED*** }}') | Set-Content .github/workflows/.condarc
3225
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
3326
with:
3427
python-version: ${{ matrix.PYTHON_VERSION }}
3528
miniforge-variant: Mambaforge
3629
miniforge-version: 4.10.0-0
3730
use-mamba: true
38-
condarc-file: .github/workflows/.condarc
3931
environment-file: environment-win.yml
4032
activate-environment: quantcore.matrix
4133
- name: Run Unit Tests

0 commit comments

Comments
 (0)