summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-12-20 09:53:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-12-20 09:53:58 (GMT)
commit7c89ea821b27c0752a3ad788a7c70501b7688e00 (patch)
tree9dbef031db94174dc7588928b5cb8e2d7eba0f93 /.github/workflows
parent6619a77555397c5e510f3ff908dd0679aae47fa7 (diff)
parent957c91a0491e852ffb147838c940d102c30a0eea (diff)
downloadtk-7c89ea821b27c0752a3ad788a7c70501b7688e00.zip
tk-7c89ea821b27c0752a3ad788a7c70501b7688e00.tar.gz
tk-7c89ea821b27c0752a3ad788a7c70501b7688e00.tar.bz2
Rebase to 9.0
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/linux-build.yml4
-rw-r--r--.github/workflows/linux-with-tcl8-build.yml (renamed from .github/workflows/linux-with-tcl87-build.yml)1
-rw-r--r--.github/workflows/linux-with-tcl9-build.yml (renamed from .github/workflows/linux-with-tcl91-build.yml)7
-rw-r--r--.github/workflows/mac-build.yml8
-rw-r--r--.github/workflows/onefiledist.yml14
-rw-r--r--.github/workflows/win-build.yml8
6 files changed, 20 insertions, 22 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index ab69f4b..618c417 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Setup Environment (compiler=${{ matrix.compiler }})
run: |
@@ -143,7 +143,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Setup Environment (compiler=${{ matrix.compiler }})
run: |
diff --git a/.github/workflows/linux-with-tcl87-build.yml b/.github/workflows/linux-with-tcl8-build.yml
index 557b0e9..606b7a6 100644
--- a/.github/workflows/linux-with-tcl87-build.yml
+++ b/.github/workflows/linux-with-tcl8-build.yml
@@ -175,4 +175,3 @@ jobs:
echo "::error::Failure during Test"
exit 1
}
- timeout-minutes: 15
diff --git a/.github/workflows/linux-with-tcl91-build.yml b/.github/workflows/linux-with-tcl9-build.yml
index 4672b54..7a31a0e 100644
--- a/.github/workflows/linux-with-tcl91-build.yml
+++ b/.github/workflows/linux-with-tcl9-build.yml
@@ -1,4 +1,4 @@
-name: Linux (with Tcl 9.1)
+name: Linux (with Tcl 9.0)
on:
push:
branches:
@@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: tip-626
+ ref: main
path: tcl
- name: Setup Environment (compiler=${{ matrix.compiler }})
run: |
@@ -124,7 +124,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: tip-626
+ ref: main
path: tcl
- name: Setup Environment (compiler=${{ matrix.compiler }})
run: |
@@ -175,4 +175,3 @@ jobs:
echo "::error::Failure during Test"
exit 1
}
- timeout-minutes: 15
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 0dc2bc7..092f968 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -23,11 +23,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Check out Tcl 9.0
+ - name: Check out Tcl 8.7
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Prepare checked out repositories
run: |
@@ -75,11 +75,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Check out Tcl 9.0
+ - name: Check out Tcl 8.7
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Prepare checked out repositories
env:
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 2c707a4..3419a63 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -24,11 +24,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Checkout Tcl 9.0
+ - name: Checkout Tcl 9.1
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Setup Environment
run: |
@@ -58,7 +58,7 @@ jobs:
# TODO: need the Tk version separately for distro naming below
- name: Package
run: |
- cp bin/wish9.0 ${BUILD_NAME}
+ cp bin/wish9.1 ${BUILD_NAME}
chmod +x ${BUILD_NAME}
tar -cf ${BUILD_NAME}.tar ${BUILD_NAME}
working-directory: ${{ env.INST_DIR }}
@@ -88,11 +88,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Checkout Tcl 9.0
+ - name: Checkout Tcl 9.1
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Checkout create-dmg
uses: actions/checkout@v4
@@ -176,11 +176,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Checkout Tcl 9.0
+ - name: Checkout Tcl 9.1
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Setup Environment
run: |
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 851774f..338e47f 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -29,11 +29,11 @@ jobs:
uses: actions/checkout@v4
with:
path: tk
- - name: Checkout Tcl 9.0
+ - name: Checkout Tcl 9.1
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Init MSVC
uses: ilammy/msvc-dev-cmd@v1
@@ -118,11 +118,11 @@ jobs:
install: git mingw-w64-x86_64-toolchain make zip
- name: Checkout Tk
uses: actions/checkout@v4
- - name: Checkout Tcl 9.0
+ - name: Checkout Tcl 9.1
uses: actions/checkout@v4
with:
repository: tcltk/tcl
- ref: main
+ ref: tip-626
path: tcl
- name: Prepare
run: |