diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index bd15382..4bfa8ef 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -42,7 +42,7 @@ jobs: STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | - set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) + set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory set BLD_ARTIFACT_PREFIX=conda_artifacts set CI=azure set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) diff --git a/.ci_support/README b/.ci_support/README old mode 100644 new mode 100755 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6c2620a..abbead2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -9,7 +9,7 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge copybara_ytausch_dev docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9f7519a..236e04f 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge copybara_ytausch_dev macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 67ea69e..573694f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge copybara_ytausch_dev macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 7ec2f4b..d1b9d57 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -5,6 +5,6 @@ c_stdlib: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge copybara_ytausch_dev target_platform: - win-64 diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh old mode 100644 new mode 100755 diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md index 4c193f2..80dbfe0 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,20 @@ About copybara-feedstock Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/copybara-feedstock/blob/main/LICENSE.txt) -Home: https://github.com/google/copybara +Home: https://github.com/ytausch/copybara Package license: Apache-2.0 -Summary: A tool for transforming and moving code between repositories +Summary: A tool for transforming and moving code between repositories (dev release). Copybara is a tool used internally at Google to transform and move code between repositories. It is often used to maintain mirrored repositories between internal Google repositories and public GitHub repositories. +This is a development release from a fork by @ytausch, which includes a fix +that hasn't been merged upstream yet. +See https://github.com/google/copybara/pull/346 for details. + Current build status ==================== @@ -69,14 +73,14 @@ Current release info Installing copybara =================== -Installing `copybara` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `copybara` from the `conda-forge/label/copybara_ytausch_dev` channel can be achieved by adding `conda-forge/label/copybara_ytausch_dev` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/copybara_ytausch_dev conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `copybara` can be installed with `conda`: +Once the `conda-forge/label/copybara_ytausch_dev` channel has been enabled, `copybara` can be installed with `conda`: ``` conda install copybara @@ -91,26 +95,26 @@ mamba install copybara It is possible to list all of the versions of `copybara` available on your platform with `conda`: ``` -conda search copybara --channel conda-forge +conda search copybara --channel conda-forge/label/copybara_ytausch_dev ``` or with `mamba`: ``` -mamba search copybara --channel conda-forge +mamba search copybara --channel conda-forge/label/copybara_ytausch_dev ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search copybara --channel conda-forge +mamba repoquery search copybara --channel conda-forge/label/copybara_ytausch_dev # List packages depending on `copybara`: -mamba repoquery whoneeds copybara --channel conda-forge +mamba repoquery whoneeds copybara --channel conda-forge/label/copybara_ytausch_dev # List dependencies of `copybara`: -mamba repoquery depends copybara --channel conda-forge +mamba repoquery depends copybara --channel conda-forge/label/copybara_ytausch_dev ``` diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..8a08c85 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +channel_targets: + - conda-forge copybara_ytausch_dev diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index d92c0a4..4d3b6e6 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,16 +1,13 @@ -context: - version: "20260615" - package: name: copybara - version: ${{ version }} + version: "20260615.dev0" source: - url: https://github.com/google/copybara/archive/refs/tags/v${{ version }}.tar.gz - sha256: bc72bf354c732960966522c9ca2db1db714b3a899e6bc4a4ff9b49b9783f595f + url: https://github.com/ytausch/copybara/archive/c939804826bf60a3d95a45f9ea4d3a1a41ec74dc.tar.gz + sha256: 2a39792529474e184efad92cf0dea3833ffce8a813fd8474259d289dbeeb4f65 build: - number: 1 + number: 0 script: - if: unix then: bash ${RECIPE_DIR}/build.sh @@ -37,12 +34,16 @@ tests: - copybara version about: - homepage: https://github.com/google/copybara - summary: A tool for transforming and moving code between repositories + homepage: https://github.com/ytausch/copybara + summary: A tool for transforming and moving code between repositories (dev release). description: | Copybara is a tool used internally at Google to transform and move code between repositories. It is often used to maintain mirrored repositories between internal Google repositories and public GitHub repositories. + + This is a development release from a fork by @ytausch, which includes a fix + that hasn't been merged upstream yet. + See https://github.com/google/copybara/pull/346 for details. license: Apache-2.0 license_file: - LICENSE