diff --git a/.github/workflows/get-python-versions.yml b/.github/workflows/get-python-versions.yml index 8217e1f1..6b8674f4 100644 --- a/.github/workflows/get-python-versions.yml +++ b/.github/workflows/get-python-versions.yml @@ -42,7 +42,7 @@ jobs: Write-Host "No new versions were found" Import-Module "./helpers/github/github-api.psm1" $gitHubApi = Get-GitHubApi -RepositoryFullName "$env:GITHUB_REPOSITORY" ` - -AccessToken "${{ secrets.PERSONAL_TOKEN }}" + -AccessToken "${{ secrets.GITHUB_TOKEN }}" $gitHubApi.CancelWorkflow("$env:GITHUB_RUN_ID") Start-Sleep -Seconds 60 - name: Send Slack notification @@ -69,7 +69,7 @@ jobs: - name: Trigger "Build python packages" workflow run: ./helpers/github/run-ci-builds.ps1 -RepositoryFullName "$env:GITHUB_REPOSITORY" ` - -AccessToken "${{ secrets.PERSONAL_TOKEN }}" ` + -AccessToken "${{ secrets.GITHUB_TOKEN }}" ` -WorkflowFileName "python-builder.yml" ` -WorkflowDispatchRef "main" ` -ToolVersions "${{ env.TOOL_VERSIONS }}" ` @@ -92,4 +92,4 @@ jobs: ./helpers/get-new-tool-versions/send-slack-notification.ps1 -Url "${{ secrets.SLACK_CHANNEL_URL }}" ` -ToolName "${{ env.TOOL_NAME }}" ` -Text "$message" ` - -ImageUrl "https://avatars.githubusercontent.com/u/1525981?s=200&v=4" \ No newline at end of file + -ImageUrl "https://avatars.githubusercontent.com/u/1525981?s=200&v=4" diff --git a/builders/ubuntu-python-builder.psm1 b/builders/ubuntu-python-builder.psm1 index fe1b42eb..51c4c692 100644 --- a/builders/ubuntu-python-builder.psm1 +++ b/builders/ubuntu-python-builder.psm1 @@ -48,6 +48,9 @@ class UbuntuPythonBuilder : NixPythonBuilder { $configureString += " --enable-loadable-sqlite-extensions" } + if ($this.Version -eq "3.11.0-alpha.7") { + $configureString += "CC=gcc CXX=g++ TCLTK_CFLAGS=-I/usr/include/tcl8.6 TCLTK_LIBS=`"-ltcl8.6 -ltk8.6`"" + } Execute-Command -Command $configureString } @@ -66,7 +69,7 @@ class UbuntuPythonBuilder : NixPythonBuilder { if ($this.Version -gt "3.0.0") { $tkinterInstallString = "sudo apt-get install -y --allow-downgrades python3-tk tk-dev" } else { - $tkinterInstallString = "sudo apt install -y python-tk tk-dev" + $tkinterInstallString = "sudo apt-get install -y python-tk tk-dev" } Execute-Command -Command $tkinterInstallString @@ -83,10 +86,19 @@ class UbuntuPythonBuilder : NixPythonBuilder { "libreadline-dev", "libgdbm-dev" ) | ForEach-Object { - Execute-Command -Command "sudo apt install -y $_" + Execute-Command -Command "sudo apt-get install -y $_" + } + + if ($this.Platform -eq "linux-18.04" -or ($this.Platform -ne "linux-18.04")) { + ### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev + Write-Host "Work around" + Execute-Command -Command "sudo add-apt-repository ppa:deadsnakes/ppa -y" + Execute-Command -Command "sudo apt-get update" + Execute-Command -Command "sudo apt-get install python3.11-tk" + Execute-Command -Command "sudo apt-get install tcl8.6 tcl8.6-dev tk8.6 tk8.6-dev" } ### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev - Execute-Command -Command "sudo apt install -y libgdbm-compat-dev" + Execute-Command -Command "sudo apt-get install -y libgdbm-compat-dev" } }