Skip to content

Commit 2b50f26

Browse files
committed
fix CI
1 parent 8ca71a9 commit 2b50f26

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

.github/workflows/qiita-plugin-ci.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
on:
44
push:
5-
branches: [ dev ]
5+
branches: [dev]
66
pull_request:
77

88
jobs:
@@ -80,13 +80,13 @@ jobs:
8080
conda create -q --yes -n qtp-job-output-folder python=3.6 pip==9.0.3
8181
conda activate qtp-job-output-folder
8282
83-
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
83+
export QIITA_ROOTCA_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
8484
export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
8585
pip --quiet install -U pip
8686
pip --quiet install .
8787
pip --quiet install coveralls
8888
89-
configure_qtp_job_output_folder --env-script "source /home/runner/.profile; conda activate qtp-job-output-folder" --server-cert $QIITA_SERVER_CERT
89+
configure_qtp_job_output_folder --env-script "source /home/runner/.profile; conda activate qtp-job-output-folder" --ca-cert $QIITA_ROOTCA_CERT
9090
9191
echo "Available Qiita plugins"
9292
ls ~/.qiita_plugins/
@@ -95,7 +95,7 @@ jobs:
9595
shell: bash -l {0}
9696
run: |
9797
conda activate qiita
98-
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
98+
export QIITA_ROOTCA_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
9999
export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
100100
sed "s#/home/runner/work/qiita/qiita#${PWD}/qiita-dev/#g" `pwd`/qiita-dev/qiita_core/support_files/config_test.cfg > ${QIITA_CONFIG_FP}
101101
@@ -127,7 +127,7 @@ jobs:
127127
COVER_PACKAGE: ${{ matrix.cover_package }}
128128
run: |
129129
conda activate qtp-job-output-folder
130-
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
130+
export QIITA_ROOTCA_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
131131
export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
132132
133133
export PYTHONWARNINGS="ignore:Certificate for localhost has no \`subjectAltName\`"
@@ -136,21 +136,21 @@ jobs:
136136
137137
- uses: codecov/codecov-action@v1
138138
with:
139-
token: ${{ secrets.CODECOV_TOKEN }}
140-
file: codecov.yml
139+
token: ${{ secrets.CODECOV_TOKEN }}
140+
file: codecov.yml
141141

142142
lint:
143143
runs-on: ubuntu-latest
144144
steps:
145-
- name: flake8
146-
uses: actions/setup-python@v2
147-
with:
148-
python-version: 3.9
149-
- name: install dependencies
150-
run: python -m pip install --upgrade pip
151-
- name: Check out repository code
152-
uses: actions/checkout@v2
153-
- name: lint
154-
run: |
155-
pip install -q flake8
156-
flake8 qtp_job_output_folder setup.py scripts/*
145+
- name: flake8
146+
uses: actions/setup-python@v2
147+
with:
148+
python-version: 3.9
149+
- name: install dependencies
150+
run: python -m pip install --upgrade pip
151+
- name: Check out repository code
152+
uses: actions/checkout@v2
153+
- name: lint
154+
run: |
155+
pip install -q flake8
156+
flake8 qtp_job_output_folder setup.py scripts/*

scripts/configure_qtp_job_output_folder

+5-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ from qtp_job_output_folder import plugin
1616
@click.command()
1717
@click.option('--env-script', prompt='Environment script',
1818
default='conda activate qtp-job-output-folder')
19-
@click.option('--server-cert', prompt='Server certificate', default='None')
20-
def config(env_script, server_cert):
19+
@click.option('--ca-cert', prompt='Server certificate', default='None')
20+
def config(env_script, ca_cert):
2121
"""Generates the Qiita configuration files"""
22-
if server_cert == 'None':
23-
server_cert = None
24-
plugin.generate_config(env_script, 'start_qtp_job_output_folder',
25-
server_cert=server_cert)
22+
if ca_cert == 'None':
23+
ca_cert = None
24+
plugin.generate_config(env_script, 'start_qtp_job_output_folder', ca_cert)
2625

2726

2827
if __name__ == '__main__':

0 commit comments

Comments
 (0)