Skip to content

Commit 5aefd5f

Browse files
authored
Merge pull request #1 from b-long/develop
Multi platform build
2 parents 20921d9 + c766e19 commit 5aefd5f

File tree

10 files changed

+555
-155
lines changed

10 files changed

+555
-155
lines changed

.github/workflows/build-golang-macos-test.yaml

Lines changed: 0 additions & 139 deletions
This file was deleted.

.github/workflows/build-golang-macos.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install dependencies
5050
run: go get .
5151
- name: Test with Go
52-
run: go test
52+
run: go test -timeout 40s -run ^TestHello$ gotdf_python -count=1 # go test
5353

5454
- name: Set up Python
5555
uses: actions/setup-python@v4
@@ -79,7 +79,7 @@ jobs:
7979
# Since we don't have our wheel build / install configured yet we use '--no-root'
8080
poetry install --no-root
8181
82-
source .venv/bin/activate
82+
source $(poetry env info --path)/bin/activate
8383
8484
# Add Go bin directory to PATH
8585
echo "export PATH=$PATH:~/.local/go/bin" >> $GITHUB_ENV
@@ -90,17 +90,17 @@ jobs:
9090
9191
poetry run pip install --upgrade setuptools wheel
9292
93-
gopy build --output=ohpygossh -vm=python3 .
93+
gopy build --output=otdf_python -vm=python3 .
9494
9595
poetry run python3 setup.py bdist_wheel
9696
9797
- name: Test Python wheel
9898
run: |
9999
# Test wheel installation
100-
pip install dist/otdf_python-0.0.1-py3-none-any.whl
100+
pip install dist/otdf_python-0.0.4-py3-none-any.whl
101101
102102
# Test wheel functionality
103-
python3 validate_otdf_python.py
103+
# python3 validate_otdf_python.py
104104
105105
# release:
106106
# needs: build
@@ -134,6 +134,6 @@ jobs:
134134
artifacts: |
135135
README.md,
136136
dist/*.whl
137-
body: OhPyGoSSH version ${{ env.PROJECT_VESION }}
137+
body: otdf_python version ${{ env.PROJECT_VESION }}
138138
# tag: "dev-${{ github.job }}-${{ env.PROJECT_VESION }}"
139139
tag: v${{ env.PROJECT_VESION }}

.github/workflows/build-golang-ubuntu.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install dependencies
3131
run: go get .
3232
- name: Test with Go
33-
run: go test
33+
run: go test -timeout 40s -run ^TestHello$ gotdf_python -count=1 # go test
3434

3535
- name: Set up Python
3636
uses: actions/setup-python@v4
@@ -60,7 +60,7 @@ jobs:
6060
# Since we don't have our wheel build / install configured yet we use '--no-root'
6161
poetry install --no-root
6262
63-
source .venv/bin/activate
63+
source $(poetry env info --path)/bin/activate
6464
6565
# Add Go bin directory to PATH
6666
echo "export PATH=$PATH:~/.local/go/bin" >> $GITHUB_ENV
@@ -71,7 +71,7 @@ jobs:
7171
7272
poetry run pip install --upgrade setuptools wheel
7373
74-
gopy build --output=ohpygossh -vm=python3 .
74+
gopy build --output=otdf_python -vm=python3 .
7575
7676
poetry run python3 setup.py bdist_wheel
7777
@@ -127,7 +127,7 @@ jobs:
127127
- name: Test Python wheel
128128
run: |
129129
# Test wheel installation
130-
pip install dist/otdf_python-0.0.1-py3-none-any.whl
130+
pip install dist/otdf_python-0.0.4-py3-none-any.whl
131131
132132
# DISABLED: Need to figure out Ubuntu nested VM
133133
# Test wheel functionality
@@ -139,6 +139,6 @@ jobs:
139139
# artifacts: |
140140
# README.md,
141141
# dist/*.whl
142-
# body: OhPyGoSSH version ${{ github.sha }}
142+
# body: otdf_python version ${{ github.sha }}
143143
# # tag: "dev-${{ github.job }}-${{ github.sha }}"
144144
# tag: dev-${{ github.run_number }}

.github/workflows/build-python.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# - name: Install dependencies
2626
# run: go get .
2727
# - name: Test with Go
28-
# run: go test
28+
# run: go test -timeout 40s -run ^TestHello$ gotdf_python -count=1 # go test
2929

3030
- name: Set up Python
3131
uses: actions/setup-python@v4

0 commit comments

Comments
 (0)