Skip to content

Commit 3b9a241

Browse files
authored
fix auth token handling for binary builds (#17)
1 parent 2461d94 commit 3b9a241

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ jobs:
7171
# Install docker and start Colima on MacOS (except it's the large runner)
7272
# GitHub xlarge MacOS runner cannot run Docker containers:
7373
# - https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/
74-
if: matrix.os == 'darwin' && matrix.runner != 'macos-13-xlarge'
74+
# if: matrix.os == 'darwin' && matrix.runner != 'macos-13-xlarge'
75+
# TODO re-enable when mac11 docker gets more stable
76+
if: ${{ false }}
7577
run: |
7678
brew install docker
7779
colima start
@@ -103,7 +105,8 @@ jobs:
103105
# GitHub Windows and xlarge MacOS runner cannot run Docker containers:
104106
# - https://github.com/orgs/community/discussions/25491
105107
# - https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/
106-
if: matrix.os != 'windows' && matrix.runner != 'macos-13-xlarge'
108+
# TODO re-enable for mac when mac11 docker gets more stable
109+
if: matrix.os != 'windows' && matrix.os != 'darwin'
107110
run: |
108111
# Pull images to avoid making smoke tests vulnerable to system behavior (docker pull speed)
109112
docker pull localstack/localstack
@@ -121,7 +124,8 @@ jobs:
121124
# - https://github.com/orgs/community/discussions/25491
122125
# - https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/
123126
# Skip these checks for forks (forks do not have access to the LocalStack Pro API key)
124-
if: matrix.os != 'windows' && matrix.runner != 'macos-13-xlarge' && !github.event.pull_request.head.repo.fork
127+
# TODO re-enable for mac when mac11 docker gets more stable
128+
if: matrix.os != 'windows' && matrix.os != 'darwin' && !github.event.pull_request.head.repo.fork
125129
run: |
126130
# Pull images to avoid making smoke tests vulnerable to system behavior (docker pull speed)
127131
docker pull localstack/localstack-pro
@@ -132,6 +136,11 @@ jobs:
132136
./localstack status services --format plain
133137
./localstack status services --format plain | grep "xray=available"
134138
./localstack stop
139+
LOCALSTACK_AUTH_TOKEN=${{ secrets.TEST_LOCALSTACK_AUTH_TOKEN }} ./localstack start -d
140+
./localstack wait -t 180
141+
./localstack status services --format plain
142+
./localstack status services --format plain | grep "xray=available"
143+
./localstack stop
135144
136145
- name: Set CLI version output
137146
id: cli_version

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ dist-bin/localstack build: $(VENV_ACTIVATE) main.py
2626
--hidden-import cookiecutter.main \
2727
--hidden-import cookiecutter.extensions \
2828
--hidden-import localstack_ext.cli.localstack \
29+
--hidden-import localstack_ext.plugins \
30+
--hidden-import localstack_ext.extensions.plugins \
2931
--additional-hooks-dir hooks
3032

3133
dist-dir/localstack: PYINSTALLER_ARGS=--distpath=dist-dir

hooks/hook-localstack_ext.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyInstaller.utils.hooks import copy_metadata
1+
from PyInstaller.utils.hooks import copy_metadata, collect_data_files
22

33
# make sure to add the entrypoints data for localstack-ext
4-
datas = copy_metadata('localstack_ext')
4+
datas = copy_metadata('localstack_ext') + collect_data_files('localstack_ext')

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pyinstaller
2-
localstack==3.0.0.post2
2+
localstack==3.0.0.post4
33
cookiecutter

0 commit comments

Comments
 (0)