diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 17:29:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 17:29:37 (GMT) |
| commit | ed00814ebf71a238985d4666ff57d9ff3b62f365 (patch) | |
| tree | bef6083206f5096954d6f973313b59d859dad4fa /.github/workflows | |
| parent | dc746b27e03f9f50ba72da10953ea28ae02d4447 (diff) | |
| parent | 73277b178e29b0e499f342d289ccede764f3e328 (diff) | |
| download | tcl-ed00814ebf71a238985d4666ff57d9ff3b62f365.zip tcl-ed00814ebf71a238985d4666ff57d9ff3b62f365.tar.gz tcl-ed00814ebf71a238985d4666ff57d9ff3b62f365.tar.bz2 | |
Merge 8.7
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/mac-build.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/onefiledist.yml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 7ca1817..bf3c420 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -16,6 +16,8 @@ jobs: working-directory: generic - name: Build run: make all + env: + CFLAGS: -arch x86_64 -arch arm64e - name: Run Tests run: make test styles=develop env: @@ -46,10 +48,13 @@ jobs: # Note that macOS is always a 64 bit platform run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1) env: + CFLAGS: -arch x86_64 -arch arm64e CFGOPT: ${{ matrix.cfgopt }} - name: Build run: | make all tcltest + env: + CFLAGS: -arch x86_64 -arch arm64e - name: Run Tests run: | make test diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index eaf9128..158542a 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -55,6 +55,9 @@ jobs: run: | mkdir 1dist touch generic/tclStubInit.c generic/tclOOStubInit.c || true + wget https://github.com/culler/macher/releases/download/v1.2/macher + sudo cp macher /usr/local/bin + sudo chmod a+x /usr/local/bin/macher echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV - name: Configure |