diff options
author | Brett Smith <brett@bestpractical.com> | 2021-08-10 15:43:42 +0300 |
---|---|---|
committer | Jim Brandt <jbrandt@bestpractical.com> | 2022-07-22 23:32:54 +0300 |
commit | 5b341448ad611092dccd142a3cb04a33dce99c35 (patch) | |
tree | d1eb68de82ff04ee8f50583b4e2fba7a8a3ea4d7 | |
parent | d221f86274d8076006919abe186b8ee781c2b743 (diff) |
Remove unused envvars from GitHub Actions
Docker containers and images only get environment variables explicitly
defined in the Dockerfile or `docker` command. Most of the `env` blocks
in our step definitions are therefore noops and can be safely removed.
Similarly, `--env` arguments that are already defined in the Dockerfile
are redundant and also noops. Clean those up too.
-rw-r--r-- | .github/workflows/github-action.yml | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index b1e68936ba..30d6b201ae 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -19,8 +19,6 @@ jobs: - name: Check out RT uses: actions/checkout@v2 - name: Build RT - env: - RT_TEST_PARALLEL: 1 shell: bash run: | docker build -t rt-base . @@ -29,7 +27,7 @@ jobs: docker exec rt bash -c "cd /rt && ./configure.ac --with-db-type=SQLite --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps" - name: Run RT tests shell: bash - run: docker exec -e RT_TEST_PARALLEL=1 rt bash -c "cd /rt && prove -rlj6 t/*" + run: docker exec rt bash -c "cd /rt && prove -rlj6 t/*" - name: Get run time if: always() shell: bash @@ -67,26 +65,16 @@ jobs: - name: Checkout RT uses: actions/checkout@v2 - name: Build RT - env: - RT_TEST_PARALLEL: 1 - RT_DBA_USER: root - RT_DBA_PASSWORD: password - DB_VERSION_TAG: 10.6 shell: bash run: | - docker run --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb:$DB_VERSION_TAG + docker run --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb:10.6 docker build -t rt-base . docker run -d -v $GITHUB_WORKSPACE:/rt --name rt --link mariadb:db rt-base docker ps -a docker exec rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps" - name: Run RT tests - env: - RT_TEST_PARALLEL: 1 - RT_DBA_USER: root - RT_DBA_PASSWORD: password - DB_VERSION_TAG: 10.6 shell: bash - run: docker exec -e RT_TEST_PARALLEL=1 -e RT_DBA_USER=root -e RT_DBA_PASSWORD=password rt bash -c "cd /rt && prove -rlj6 t/*" + run: docker exec rt bash -c "cd /rt && prove -rlj6 t/*" - name: Get run time if: always() shell: bash @@ -124,31 +112,17 @@ jobs: - name: Checkout RT uses: actions/checkout@v2 - name: Build RT - env: - DB_VERSION_TAG: 12.8 - RT_TEST_PARALLEL: 1 - RT_TEST_WEB_HANDLER: apache+fcgid - HTTPD_ROOT: /etc/apache2 - RT_TEST_APACHE: /usr/sbin/apache2 - RT_TEST_APACHE_MODULES: /usr/lib/apache2/modules shell: bash run: | - docker run --name postgresql --mount type=tmpfs,destination=/var/lib/postgresql/data -e POSTGRES_PASSWORD=password -d postgres:$DB_VERSION_TAG + docker run --name postgresql --mount type=tmpfs,destination=/var/lib/postgresql/data -e POSTGRES_PASSWORD=password -d postgres:12.8 docker build -t rt-base . docker run -d -v $GITHUB_WORKSPACE:/rt --name rt --link postgresql:db rt-base docker ps -a docker exec rt bash -c "chown -R rt-user /rt; touch /etc/apache2/mime.types" docker exec -e USER=rt-user -u rt-user rt bash -c "cd /rt && ./configure.ac --with-db-type=Pg --with-my-user-group --enable-layout=inplace --with-web-handler=fcgid --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps && chmod a+rX /rt/sbin/*" - name: Run RT tests - env: - DB_VERSION_TAG: 12.8 - RT_TEST_PARALLEL: 1 - RT_TEST_WEB_HANDLER: apache+fcgid - HTTPD_ROOT: /etc/apache2 - RT_TEST_APACHE: /usr/sbin/apache2 - RT_TEST_APACHE_MODULES: /usr/lib/apache2/modules shell: bash - run: docker exec -e RT_TEST_PARALLEL=1 -e RT_DBA_USER=postgres -e RT_DBA_PASSWORD=password -u rt-user rt bash -c "cd /rt && prove -rlj6 t/*" + run: docker exec -e RT_DBA_USER=postgres -e RT_TEST_WEB_HANDLER=apache+fcgid -e HTTPD_ROOT=/etc/apache2 -e RT_TEST_APACHE=/usr/sbin/apache2 -e RT_TEST_APACHE_MODULES=/usr/lib/apache2/modules -u rt-user rt bash -c "cd /rt && prove -rlj6 t/*" - name: Get run time if: always() shell: bash |