diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 5498d69606..08f93a95a8 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -21,6 +21,10 @@ on: branches: - 'master' + # pull_request: + # branches: + # - 'master' + jobs: # Build the docker image @@ -70,6 +74,7 @@ jobs: test -f data/secret_key.txt - name: Run Unit Tests run: | + echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> docker.dev.env docker-compose run inventree-dev-server invoke test --disable-pty docker-compose down - name: Set up QEMU diff --git a/InvenTree/plugin/base/integration/mixins.py b/InvenTree/plugin/base/integration/mixins.py index 313f7cc56c..232394ca3d 100644 --- a/InvenTree/plugin/base/integration/mixins.py +++ b/InvenTree/plugin/base/integration/mixins.py @@ -537,8 +537,11 @@ class APICallMixin: headers = {'Content-Type': 'application/json'} if getattr(self, 'API_TOKEN_SETTING'): token = self.get_setting(self.API_TOKEN_SETTING) - headers[self.API_TOKEN] = token - headers['Authorization'] = f"{self.API_TOKEN} {token}" + + if token: + headers[self.API_TOKEN] = token + headers['Authorization'] = f"{self.API_TOKEN} {token}" + return headers def api_build_url_args(self, arguments: dict) -> str: