diff --git a/.github/workflows/openlane_ci.yml b/.github/workflows/openlane_ci.yml index d2c01c053..95c92749d 100644 --- a/.github/workflows/openlane_ci.yml +++ b/.github/workflows/openlane_ci.yml @@ -329,7 +329,7 @@ jobs: echo "TAG_LIST=" >> $GITHUB_ENV - name: Docker Tag (Main Branch Hashes) - if: ${{ env.PUSHING == '1' && github.event_name == 'push' && env.BRANCH_NAME == env.MAIN_BRANCH }} + if: ${{ env.PUSHING == '1' && github.event_name == 'push' && env.BRANCH_NAME == vars.MAIN_BRANCH }} run: | echo "TAG_LIST=$TAG_LIST ${{ env.GIT_COMMIT_HASH }}" >> $GITHUB_ENV diff --git a/default.nix b/default.nix index 1989076ce..4c5ed8f9f 100644 --- a/default.nix +++ b/default.nix @@ -49,8 +49,9 @@ pyenv-sitepackages = "${pyenv}/${pyenv.sitePackages}"; in stdenv.mkDerivation rec { - name = "openlane1"; - + pname = "openlane1"; + version = "1.1.1"; + src = [ ./flow.tcl ./scripts diff --git a/docker/docker.nix b/docker/docker.nix index 25c6090bb..010c77352 100644 --- a/docker/docker.nix +++ b/docker/docker.nix @@ -48,19 +48,18 @@ in (createDockerImage { extra-experimental-features = "nix-command flakes repl-flake"; }; maxLayers = 2; - channelURL = "https://nixos.org/channels/nixos-23.11"; + channelURL = "https://nixos.org/channels/nixos-24.05"; image-created = "now"; image-extraCommands = '' mkdir -p ./etc - cp -r ${openlane1}/bin ./openlane1 - chmod -R 755 ./openlane1 + ln -s ${openlane1}/bin ./openlane1 cat < ./etc/zshrc autoload -U compinit && compinit autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp autoload -U colors && colors - export PS1=$'%{\033[31m%}OpenLane Container%{\033[0m%}:%{\033[32m%}%~%{\033[0m%}%% '; + export PS1=$'%{\033[31m%}OpenLane Container (${openlane1.version})%{\033[0m%}:%{\033[32m%}%~%{\033[0m%}%% '; HEREDOC ''; image-config-cwd = "/openlane"; diff --git a/scripts/openlane-1.1.0.tm b/scripts/openlane-1.1.1.tm similarity index 100% rename from scripts/openlane-1.1.0.tm rename to scripts/openlane-1.1.1.tm diff --git a/scripts/openlane_utils-1.1.0.tm b/scripts/openlane_utils-1.1.1.tm similarity index 100% rename from scripts/openlane_utils-1.1.0.tm rename to scripts/openlane_utils-1.1.1.tm