Skip to content

Commit 12358a4

Browse files
newdigatenewdigate
committed
noinstall github actions corrections
1 parent d73f960 commit 12358a4

13 files changed

+21
-142
lines changed

‎.github/workflows/basic_example.yml

+2-48
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,9 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
35-
- uses: actions/checkout@v2
36-
with:
37-
repository: newdigate/teensy-x86-bounce2-stubs
38-
path: teensy-x86-bounce2-stubs
39-
40-
- uses: actions/checkout@v2
41-
with:
42-
repository: newdigate/teensy-x86-encoder-stubs
43-
path: teensy-x86-encoder-stubs
44-
4520
- name: download dependencies
4621
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
4722

48-
- name: Make and Install teensy-x86-stubs
49-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install teensy-gfx
52-
run: cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
53-
54-
- name: Make and Install teensy-x86-sd-stubs
55-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
56-
57-
- name: Make and Install st7735
58-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
59-
60-
- name: Make and Install st7735_opengl
61-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
62-
63-
- name: Make and Install teensy-x86-bounce2-stubs
64-
run: cd teensy-x86-bounce2-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
65-
66-
- name: Make and Install teensy-x86-encoder-stubs
67-
run: cd teensy-x86-encoder-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
68-
6923
- name: Create Build Environment
7024
# Some projects don't allow in-source building, so create a separate build directory
7125
# We'll use this as our working directory for all subsequent commands
@@ -79,10 +33,10 @@ jobs:
7933
# Note the current convention is to use the -S and -B options here to specify source
8034
# and build directories, but this is only available with CMake 3.13 and higher.
8135
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
82-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/basic -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
8337

8438
- name: Build
8539
working-directory: ${{github.workspace}}/build
8640
shell: bash
8741
# Execute the build. You can specify a specific target with "--target <NAME>"
88-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target basic --config $BUILD_TYPE

‎.github/workflows/scrolltest_example.yml

+2-33
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,9 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
3520
- name: download dependencies
3621
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
3722

38-
- name: Make and Install teensy-x86-stubs
39-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
41-
- name: Make and Install teensy-gfx
42-
run: |
43-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
44-
45-
- name: Make and Install teensy-x86-sd-stubs
46-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
47-
48-
- name: Make and Install st7735
49-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install st7735_opengl
52-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
53-
5423
- name: Create Build Environment
5524
# Some projects don't allow in-source building, so create a separate build directory
5625
# We'll use this as our working directory for all subsequent commands
@@ -64,10 +33,10 @@ jobs:
6433
# Note the current convention is to use the -S and -B options here to specify source
6534
# and build directories, but this is only available with CMake 3.13 and higher.
6635
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
67-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/scrolltest -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
6837

6938
- name: Build
7039
working-directory: ${{github.workspace}}/build
7140
shell: bash
7241
# Execute the build. You can specify a specific target with "--target <NAME>"
73-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target scrolltest --config $BUILD_TYPE

‎.github/workflows/spitftbitmap_example.yml

+2-33
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,9 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
3520
- name: download dependencies
3621
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev libboost-test-dev
3722

38-
- name: Make and Install teensy-x86-stubs
39-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
41-
- name: Make and Install teensy-x86-sd-stubs
42-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
43-
44-
- name: Make and Install teensy-gfx
45-
run: |
46-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
47-
48-
- name: Make and Install st7735
49-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install st7735_opengl
52-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
53-
5423
- name: Create Build Environment
5524
# Some projects don't allow in-source building, so create a separate build directory
5625
# We'll use this as our working directory for all subsequent commands
@@ -64,10 +33,10 @@ jobs:
6433
# Note the current convention is to use the -S and -B options here to specify source
6534
# and build directories, but this is only available with CMake 3.13 and higher.
6635
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
67-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/spitftbitmap -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
6837

6938
- name: Build
7039
working-directory: ${{github.workspace}}/build
7140
shell: bash
7241
# Execute the build. You can specify a specific target with "--target <NAME>"
73-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target spitftbitmap --config $BUILD_TYPE

‎.github/workflows/ubuntu-opengl.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
# Note the current convention is to use the -S and -B options here to specify source
3434
# and build directories, but this is only available with CMake 3.13 and higher.
3535
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
36-
run: cmake $GITHUB_WORKSPACE/extras/opengl -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
3737

3838
- name: Build
3939
working-directory: ${{github.workspace}}/build
4040
shell: bash
4141
# Execute the build. You can specify a specific target with "--target <NAME>"
42-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target teensy_st7735_linux_opengl --config $BUILD_TYPE

‎CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ project(teensy_st7735_linux CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6-
include(Dependencies.CMake.in)
6+
include(cmake_declare_and_fetch.cmake.in)
7+
8+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
9+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git noinstall src)
710

811
add_subdirectory(src)
912
add_subdirectory(extras/opengl)

‎Dependencies.CMake.in

-6
This file was deleted.

‎extras/opengl/CMakeLists.txt

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl CXX)
33
include(../../cmake_declare_and_fetch.cmake.in)
4-
set(CMAKE_CXX_STANDARD 11)
4+
set(CMAKE_CXX_STANDARD 17)
5+
6+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
7+
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs.git noinstall src)
8+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git noinstall src)
9+
DeclareAndFetch(teensy_x86_encoder_stubs https://github.com/newdigate/teensy-x86-encoder-stubs.git noinstall src)
10+
DeclareAndFetch(teensy_x86_bounce2_stubs https://github.com/newdigate/teensy-x86-bounce2-stubs.git noinstall src)
11+
12+
include(opengl.cmake.in)
513

614
add_subdirectory(src)
715
add_subdirectory(examples)

‎extras/opengl/common.cmake.in

-5
This file was deleted.

‎extras/opengl/examples/button/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ set(CMAKE_CXX_STANDARD 17)
55
# comment out the line below to reference source, rather than referencing installed libraries (default)
66

77
include_directories(../../src)
8-
DeclareAndFetch(teensy_x86_encoder_stubs https://github.com/newdigate/teensy-x86-encoder-stubs.git noinstall src)
9-
DeclareAndFetch(teensy_x86_bounce2_stubs https://github.com/newdigate/teensy-x86-bounce2-stubs.git noinstall src)
10-
11-
include(../../opengl.cmake.in)
128

139
set(APP_SOURCES graphicstest.cpp)
1410

‎extras/opengl/examples/scrolltest/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ project(teensy_st7735_linux_extras_opengl_examples_scrolltest C CXX)
33
set(CMAKE_CXX_STANDARD 17)
44

55
include_directories(../../src)
6-
include(../../opengl.cmake.in)
76

87
set(APP_SOURCES scrolltest.cpp)
98

‎extras/opengl/examples/spitftbitmap/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl_examples_spitftbitmap C CXX)
33
set(CMAKE_CXX_STANDARD 17)
44

5-
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs.git noinstall src)
6-
75
include_directories(../../src)
86
include_directories(../../../../src)
9-
include(../../opengl.cmake.in)
107

118
set(APP_SOURCES spitftbitmap.cpp)
129

‎extras/opengl/examples/thread/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ set(CMAKE_CXX_STANDARD 11)
44

55
include_directories(../../src)
66

7-
include(../../opengl.cmake.in)
8-
97
set(APP_SOURCES thread.cpp)
108

119
add_executable(thread ${APP_SOURCES})

‎extras/opengl/src/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ project(teensy_st7735_linux_opengl CXX)
33
set(teensy_st7735_linux_opengl_VERSION 1.0.0)
44
set(CMAKE_CXX_STANDARD 11)
55

6-
include(../opengl.cmake.in)
7-
include(../common.cmake.in)
8-
96
set(SOURCE_FILES
107
st7735_opengl.cpp
118
st7735_opengl_main.cpp)

0 commit comments

Comments
 (0)